tests/test-merge1.out
author mpm@selenic.com
Wed, 07 Sep 2005 19:30:23 -0700
changeset 1208 4644df4944ff
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Clean up local clone file list We now use an explicit list of files to copy during clone so that we don't copy anything we shouldn't.

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