Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1110:1032a505488c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author mpm@selenic.com
date Sat, 27 Aug 2005 18:11:32 -0700
parents 5a034646e472
children 67a28636ea64
line wrap: on
line source

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