Mercurial > hg

diff tests/test-simplemerge.py @ 26528:8bfef5737321

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: move 'merging' output to before file creation This has no visible impact but makes some future work simpler.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 22:58:52 -0700
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff