Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: customize graft conflict markers (BC)
authorDurham Goode <durham@fb.com>
Fri, 09 May 2014 18:15:02 -0700
changeset 21525 559f01f19cf6
parent 21524 47b97d9af27e
child 21526 3b40e32e88c3
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.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu May 08 16:54:23 2014 -0700
+++ b/mercurial/commands.py	Fri May 09 18:15:02 2014 -0700
@@ -3178,7 +3178,8 @@
                     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
hg-stable