164   [1]

   164   [1]

   165 

   165 

   166   $ echo foobar > c

   166   $ echo foobar > c

   167   $ hg resolve --all --mark

   167   $ hg resolve --all --mark

   168   (no more unresolved files)

   168   (no more unresolved files)

   169   $ hg grab --continue

   170   $ hg grab --continue

   170   $ hg glog

   171   $ hg glog

   171   @  8:44e155eb95c7 add c

   172   @  8:44e155eb95c7 add c

   172   |

   173   |

   173   o  7:2ccc03d1d096 foo to c

   174   o  7:2ccc03d1d096 foo to c