tests/test-merge2.out
author Brendan Cully <brendan@kublai.com>
Fri, 23 Jun 2006 17:21:04 -0700
changeset 2492 2f4addf56715
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Test case for #295

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