view tests/test-merge2.out @ 2487:041363739ca8

Test case for #294
author Brendan Cully <brendan@kublai.com>
date Fri, 23 Jun 2006 08:10:06 +0200
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b