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-merge5.out
author Martin Geisler <mg@aragost.com>
Fri, 13 Aug 2010 10:13:38 +0200
branchstable
changeset 11834 a86fd45c1911
parent 9717 68a1b9d0663e
permissions -rw-r--r--
hgrc.5: fix "hg hg status" -> "hg status"

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mercurial