tests/test-merge2.out
author TK Soh <teekaysoh@yahoo.com>
Thu, 01 Sep 2005 09:11:25 -0700
changeset 1192 6e165de907c5
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Add -p to incoming and outgoing commands to show patch
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