Mercurial > hg

view tests/test-simplemerge.py.out @ 26605:ef21a2c41629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a wrapper around the filemerge function We'll introduce a separate premerge function that calls the same code.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 12:31:08 -0700
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK