tests/test-empty-dir.out
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 01:16:06 -0500
changeset 3317 966632304dde
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests

321
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
sub/b not present
sub not present