230 Add some unconflicting changes on each head, to make sure we really

   230 Add some unconflicting changes on each head, to make sure we really

   231 are merging, unlike :local and :other

   231 are merging, unlike :local and :other

   232 

   232 

   233   $ hg up -C

   233   $ hg up -C

   234   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

   234   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

   235   $ printf "\n\nEnd of file\n" >> a

   236   $ printf "\n\nEnd of file\n" >> a

   236   $ hg ci -m "Add some stuff at the end"

   237   $ hg ci -m "Add some stuff at the end"

   237   $ hg up -r 1

   238   $ hg up -r 1

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

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

   239   $ printf "Start of file\n\n\n" > tmp

   240   $ printf "Start of file\n\n\n" > tmp

   267   

   268   

   268   End of file

   269   End of file

   269 

   270 

   270   $ hg up -C

   271   $ hg up -C

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

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

   272   $ hg merge --tool :merge-local

   274   $ hg merge --tool :merge-local

   273   merging a

   275   merging a

   274   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

   276   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

   275   (branch merge, don't forget to commit)

   277   (branch merge, don't forget to commit)

   276   $ cat a

   278   $ cat a