tests/test-merge1.out
author mpm@selenic.com
Wed, 17 Aug 2005 12:26:06 -0800
changeset 936 b62d1e738fa9
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Add a simple remove test

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