tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 07 Jan 2006 16:34:20 +0100
changeset 1612 0d36e3d7e2ea
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Adjusted test output to match new hgignore error messages.
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