Mercurial Mercurial > hg / 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 Martin von Zweigbergk <martinvonz@google.com>
Thu, 11 Dec 2014 21:06:16 -0800
changeset 23639 35c724903157
parent 22023 f18830651811
permissions -rw-r--r--
merge: let _resolvetrivial() work on the file->action dict By moving the conversion from the file->action dict after _resolvetrivial(), we greatly simplify and clarify that method.

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

OK
Mercurial