Mercurial > hg

view tests/test-simplemerge.py.out @ 27652:cc91f3bc5461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_checkunknownfiles: rename 'aborts' to 'conflicts' In upcoming patches we'll be able to do more useful things than aborting.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 02 Jan 2016 03:02:57 -0800
parents f18830651811
children
line wrap: on
line source

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

OK