# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 2014-05-10 01:15:02
# Node ID 559f01f19cf6b8054f010e51c0c958157e617f8b
# Parent  47b97d9af27e0c521b11c8f9464a2d037851f827

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
@@ -3178,7 +3178,8 @@ def graft(ui, repo, *revs, **opts):
                     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