Mercurial Mercurial > hg / annotate
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.
mercurial/__init__.py
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 11 Dec 2014 21:06:16 -0800
changeset 23639 35c724903157
parent 0 9117c6561b0b
child 27220 4374d819ccd5
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
Mercurial