hgext/histedit.py
changeset 48613 f1162b125991
parent 48419 9503e15dc588
child 48961 df56e6bd37f6
--- 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