156   merging a

   156   merging a

   157   warning: conflicts during merge.

   157   warning: conflicts during merge.

   158   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

   158   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

   159   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   159   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   160   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   160   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   161   abort: cannot manage merge changesets

   162   abort: cannot manage merge changesets

   162   $ rm -r sandbox

   163   $ rm -r sandbox

   163 

   164 

   164 hg headers

   165 hg headers

   165 

   166 

   229   merging a

   230   merging a

   230   warning: conflicts during merge.

   231   warning: conflicts during merge.

   231   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

   232   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

   232   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   233   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   233   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   234   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   234   abort: cannot manage merge changesets

   236   abort: cannot manage merge changesets

   235   $ rm -r sandbox

   237   $ rm -r sandbox

   236 

   238 

   237 Test saving last-message.txt

   239 Test saving last-message.txt

   238 

   240