Comments
Patch
@@ -483,7 +483,10 @@
When overwrite is set, changes are clobbered, merged else
returns stats (see pydoc mercurial.merge.applyupdates)"""
- return mergemod.update(repo, node, False, overwrite, None)
+ return mergemod.update(repo, node, False, overwrite, None, labels=[
+ 'working copy',
+ 'destination',
+ ])
def update(repo, node):
"""update the working directory to node, merging linear changes"""
@@ -57,11 +57,11 @@
@@ -1,3 +1,7 @@
added file1
another line of text
- +<<<<<<< local: c3fa test - "added file1 and file2"
+ +<<<<<<< working copy: c3fa test - "added file1 and file2"
+changed file1 different
+=======
changed file1
- +>>>>>>> other: dfab test - "changed file1"
+ +>>>>>>> destination: dfab test - "changed file1"
$ hg status
M file1