view tests/test-empty-dir.out @ 4674:723e0ddb6ada

merge: warn user about divergent renames
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 18:02:03 -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