tests/test-merge1.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 31 Aug 2005 11:19:20 -0700
changeset 1177 862f53c1d0f9
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
hg serve: print a more useful error message if server can't start.

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