tests/test-merge1.out
author mpm@selenic.com
Sat, 27 Aug 2005 18:11:32 -0700
changeset 1110 1032a505488c
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Add a simple dummy ssh test This uses the -e flag to run a dummy script rather than actual ssh to test the protocol over a local pipe.

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