tests/test-merge2.out
author Brendan Cully <brendan@kublai.com>
Mon, 12 Mar 2007 14:50:19 -0700
changeset 4198 aee3d312c32e
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Add test for branch shadowing

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