tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 04 Dec 2006 17:43:37 -0600
changeset 3788 18c93649f563
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Merge with crew

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)