tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 20:00:14 -0500
changeset 3116 bb74f809bc95
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge: reorder tests on m2 items in manifestmerge

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)