view tests/test-empty-dir.out @ 3096:54d85098fb82

merge: make unresolved a counter
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:39:54 -0500
parents b2ae81a7df29
children
line wrap: on
line source

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