Mercurial Mercurial > mercurial / 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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 03 Dec 2008 01:28:33 +0100
changeset 7464 3a829f29d1e2
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
re-add +x bit for test-convert-darcs (was missing from 14ed6662af48)

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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')
mercurial