Mercurial Mercurial > mercurial / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Sat, 05 Mar 2011 16:34:59 -0600
changeset 13536 fac040b7e822
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge: drop resolve state for mergers with identical contents (issue2680)

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

OK
mercurial