view tests/test-merge1.out @ 1229:2eb1cd695dd2

Fix comment typo
author mpm@selenic.com
date Fri, 09 Sep 2005 11:47:13 -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