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 Christian Ebert <blacktrash@gmx.net>
Thu, 03 Jun 2010 10:37:31 +0100
changeset 11296 0054a328b98f
parent 9717 68a1b9d0663e
permissions -rw-r--r--
keyword: use context to detect uncommitted merge

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