Mercurial > hg

view tests/test-simplemerge.py.out @ 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 f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK