tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Tue, 22 Aug 2006 19:12:09 -0500
changeset 2978 962b9c7df641
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
merge: add remove to the action hash

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)