tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 21:11:26 -0500
changeset 3121 1c1e59aac82a
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge: simplify local created logic

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