Mercurial Mercurial > hg-stable / 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 Nicolas Dumazet <nicdumz.commits@gmail.com>
Mon, 21 Dec 2009 20:19:21 +0100
changeset 10107 c03f467423f3
parent 9717 68a1b9d0663e
permissions -rw-r--r--
bookmarks: repo._bookmarkcurrent should be a propertycache

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
hg-stable