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 Matt Mackall <mpm@selenic.com>
Fri, 10 Oct 2008 12:08:49 -0500
changeset 7084 f5c18a581b8b
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
inotify: add a test for lookup bug

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