Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 21526:3b40e32e88c3
rebase: specify custom conflict marker labels for rebase (BC)
Changes rebase conflict markers to say 'source' and 'dest' instead of
'local' and 'other'. This ends up looking like:
one
<<<<<<< dest: a3e5c7fd master - bob: "A commit to master"
master
=======
mine
>>>>>>> source: c7fda3e5 - durham: "A commit to my feature branch"
three
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Thu, 08 May 2014 16:55:56 -0700 |
| parents | 5b70ece79ea7 |
| children | 4b93e19cd6e6 |
line wrap: on
line diff
--- a/hgext/rebase.py Fri May 09 18:15:02 2014 -0700 +++ b/hgext/rebase.py Thu May 08 16:55:56 2014 -0700 @@ -531,7 +531,8 @@ repo.ui.debug(" detach base %d:%s\n" % (repo[base].rev(), repo[base])) # When collapsing in-place, the parent is the common ancestor, we # have to allow merging with it. - return merge.update(repo, rev, True, True, False, base, collapse) + return merge.update(repo, rev, True, True, False, base, collapse, + labels=['dest', 'source']) def nearestrebased(repo, rev, state): """return the nearest ancestors of rev in the rebase result"""