Mercurial > hg
diff tests/test-dispatch.t @ 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 | ef60083b5536 |
| children | aa5e256839d5 |