view tests/test-merge1.out @ 939:6b735e0ddd81

Fix stray debug statement
author mpm@selenic.com
date Wed, 17 Aug 2005 18:41:04 -0800
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