Mercurial > hg

view tests/test-simplemerge.py.out @ 20233:410193f11422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands.bookmarks: pass cur in explicitly to checkconflict cur will be moved inside the wlock in a future patch, so we need to pass it into checkconflict explicitly.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 21 Nov 2013 17:11:04 -0800
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK