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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 21 Aug 2007 02:02:08 +0200
changeset 5206 6a1d2dd96b8e
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
abort when adding a file in merged state

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
hg-stable