Mercurial > hg
view tests/bundles/renames.hg @ 28634:3ceac01bc29f
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 | ebf6d38c9063 |
| children |