From patchwork Thu May 15 20:52:42 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [5,of,5,V4] graft: customize graft conflict markers (BC)
From: Durham Goode <durham@fb.com>
X-Patchwork-Id: 4758
Message-Id: <742dbe5363429a31bc6b.1400187162@dev2000.prn2.facebook.com>
To: <mercurial-devel@selenic.com>
Date: Thu, 15 May 2014 13:52:42 -0700

# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399684502 25200
#      Fri May 09 18:15:02 2014 -0700
# Node ID 742dbe5363429a31bc6b34ba2183da805254f786
# Parent  bb62c44b762c45dd6fdd0bbd0b322e12023d0005
graft: customize graft conflict markers (BC)

Changes the graft conflict markers to be 'graft' and 'local' to make it
more intuitive which side is which.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3185,7 +3185,7 @@
                     repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                       'graft')
                     stats = mergemod.update(repo, ctx.node(), True, True, False,
-                                            ctx.p1().node())
+                        ctx.p1().node(), labels=['local', 'graft'])
                 finally:
                     repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
                 # report any conflicts