tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Tue, 17 Oct 2006 18:30:19 -0500
changeset 3430 9a6491770b04
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Report branch for hg id

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)