Mercurial > hg

diff mercurial/merge.py @ 48590:7e503eff3c76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 13:23:49 -0800
parents b5f8d9e55d42
children 937998e43e93
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Jan 18 15:04:55 2022 -0800
+++ b/mercurial/merge.py	Tue Jan 18 13:23:49 2022 -0800
@@ -2280,7 +2280,7 @@
         ctx.rev(),
         branchmerge=False,
         force=False,
-        labels=[b'working copy', b'destination'],
+        labels=[b'working copy', b'destination', b'working copy parent'],
         updatecheck=updatecheck,
         wc=wc,
     )