tests/test-merge1.out
author mpm@selenic.com
Tue, 13 Sep 2005 14:18:18 -0500
changeset 1233 5381b0d88e9e
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Fix abort message for clone

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