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 Thomas Arendsen Hein <thomas@intevation.de>
Sun, 26 Mar 2006 22:54:05 +0200
changeset 2009 182f500805db
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
Fix broken hgignore tests due to full path showing up in output.

%%% 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