mercurial/commands.py
changeset 48589 a51c522c0064
parent 48461 eaad68294904
child 48593 47b3fca301f8
--- a/mercurial/commands.py	Tue Jan 18 14:57:15 2022 -0800
+++ b/mercurial/commands.py	Tue Jan 18 15:04:55 2022 -0800
@@ -4914,7 +4914,7 @@
     overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
     with ui.configoverride(overrides, b'merge'):
         force = opts.get(b'force')
-        labels = [b'working copy', b'merge rev']
+        labels = [b'working copy', b'merge rev', b'common ancestor']
         return hg.merge(ctx, force=force, labels=labels)