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

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
hg-stable