view tests/test-merge1.out @ 1043:9344f5dd4488

Update tests
author mpm@selenic.com
date Wed, 24 Aug 2005 19:19:35 -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