Mercurial > hg
diff mercurial/commands.py @ 21525:559f01f19cf6
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.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 09 May 2014 18:15:02 -0700 |
parents | 10f15e34d86c |
children | 6062593d8b06 |
line wrap: on
line diff
--- 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