tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Mon, 14 Aug 2006 14:14:08 -0500
changeset 2898 06c05c675a35
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge: minor simplification

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