tests/test-merge2.out
author Robin Farine <robin.farine@terminus.org>
Tue, 08 Nov 2005 10:35:05 -0800
changeset 1512 53ad6ee6ede4
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
generalize copy/rename to handle more than one source directory
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