view tests/test-merge1.out @ 1096:ae4f1f48c569

sshrepo: adjust file comment
author mpm@selenic.com
date Sat, 27 Aug 2005 15:05:59 -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