Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-confused-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 14 Dec 2005 22:19:03 -0600
changeset 1581 db10b7114de0
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
abort when merging two heads and repository has local changes

%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b
mercurial-crew-with-dirclash