tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 17 Jan 2006 16:00:55 +0100
changeset 1624 d9e576e55d81
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Added test for relative paths and all status flags for 'hg status'
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