Mercurial > hg

comparison tests/test-git-export.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 1184edaead7a
children e22248f6d257
comparison
equal deleted inserted replaced
21525:559f01f19cf6 21526:3b40e32e88c3