tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 25 May 2009 10:44:37 -0500
changeset 8639 1323dddf8078
parent 6336 4b0c9c674707
permissions -rw-r--r--
lookup: check for dirstate damage on failure

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