Mercurial > hg

view tests/test-simplemerge.py.out @ 42804:7b80ad5af239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: hint about using `hg resolve` for resolving conflicts This was suggested by one of our users at Google. Makes sense to me. Differential Revision: https://phab.mercurial-scm.org/D6755
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 21 Aug 2019 13:14:39 -0700
parents f18830651811
children
line wrap: on
line source

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

OK