Mercurial > hg

view tests/test-simplemerge.py.out @ 32313:a580b2d65ded

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: make sure merge state is cleaned up for no-op rebases (issue5494) If a rebase ends up doing a no-op commit, make sure the merge state is still cleaned up.
author Jeremy Fitzhardinge <jsgf@fb.com>
date Thu, 18 May 2017 13:18:05 -0700
parents f18830651811
children
line wrap: on
line source

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

OK