Mercurial > hg

diff tests/test-graft.t @ 28634:3ceac01bc29f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: save merge part labels for later reuse We permit the caller of merge operations to supply labels for the merge parts ("local", "other", and optionally "base"). These labels are used in conflict markers to reduce confusion; however, the labels were not persistent, so 'hg resolve' would lose the labels. Store the labels in the mergestate.
author Simon Farnsworth <simonfar@fb.com>
date Sat, 19 Mar 2016 18:37:10 -0700
parents 564a354f7f35
children fc1d75e7a98d
line wrap: on
line diff
--- a/tests/test-graft.t	Fri Mar 25 21:51:00 2016 +0000
+++ b/tests/test-graft.t	Sat Mar 19 18:37:10 2016 -0700
@@ -452,7 +452,7 @@
   c
   =======
   b
-  >>>>>>> other: 5d205f8b35b6  - bar: 1
+  >>>>>>> graft: 5d205f8b35b6  - bar: 1
   $ echo b > a
   $ hg resolve -m a
   (no more unresolved files)