tests/test-confused-revert.out
author Benoit Boissinot <mercurial-bugs@selenic.com>
Wed, 26 Oct 2005 16:10:56 -0700
changeset 1454 f4250806dbeb
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
further fix traceback on invalid .hgignore patterns Please apply this little fix (matchfn return None if no patterns are specified).

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