view tests/test-merge1.out @ 969:1d5b97537561

Minor README updates
author mpm@selenic.com
date Sat, 20 Aug 2005 00:49:41 -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