tests/test-merge1.out
author TK Soh <teekaysoh@yahoo.com>
Thu, 01 Sep 2005 09:11:25 -0700
changeset 1192 6e165de907c5
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Add -p to incoming and outgoing commands to show patch

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b