Mercurial > hg

diff tests/test-pull-branch.t @ 21526:3b40e32e88c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4f8054d3171b
children 701df761aa94
line wrap: on
line diff