Mercurial > hg

view tests/test-simplemerge.py.out @ 27033:089dab8794dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: return whether the file is deleted from all other merge tools This is required for change/delete conflicts -- see the previous patch for more information.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 13:55:31 -0800
parents f18830651811
children
line wrap: on
line source

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

OK