view tests/test-merge1.out @ 1119:7fca9752d945

Protect against unknown repositories.
author roberto@keltia.freenix.fr
date Sat, 27 Aug 2005 23:42:51 -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