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.
hgext/__init__.py
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 02 Dec 2014 16:39:59 -0800
changeset 23472 48cdf90f17c5
parent 1360 7d439981bec4
child 28450 155e3308289c
permissions -rw-r--r--
update: remove redundant and misplaced merge tests The "nothing to merge" case is covered by test-merge-default.t. The "uncommitted changes" case is covered by test-merge1.t (and others). The "merge -f" case is covered by test-merge-force.t.

# placeholder
Mercurial