Mercurial > public > mercurial-scm > hg-stable

diff hgext/histedit.py @ 48613:f1162b125991

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12023
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 21 Jan 2022 13:48:18 -0800
parents 9503e15dc588
children df56e6bd37f6
line wrap: on
line diff
--- a/hgext/histedit.py	Tue Jan 18 13:23:49 2022 -0800
+++ b/hgext/histedit.py	Fri Jan 21 13:48:18 2022 -0800
@@ -667,7 +667,15 @@
             repo.ui.setconfig(
                 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
             )
-            stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit'])
+            stats = mergemod.graft(
+                repo,
+                ctx,
+                labels=[
+                    b'already edited',
+                    b'current change',
+                    b'parent of current change',
+                ],
+            )
         finally:
             repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
     return stats