diff tests/test-rename-dir-merge @ 4674:723e0ddb6ada

merge: warn user about divergent renames
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 18:02:03 -0500
parents 7b88bd88f040
children dee573ba79f1
line wrap: on
line diff