tests/test-merge2.out
author Benoit Boissinot <mercurial-bugs@selenic.com>
Wed, 26 Oct 2005 16:10:56 -0700
changeset 1454 f4250806dbeb
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
further fix traceback on invalid .hgignore patterns Please apply this little fix (matchfn return None if no patterns are specified).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     1
adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     2
adding b