tests/test-merge1.out
author Bryan O'Sullivan <bos@serpentine.com>
Sun, 04 Sep 2005 14:48:33 -0700
changeset 1203 cb4c423cbb38
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Get test-commit to exit cleanly.

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