diff tests/test-manifest-merging.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 be8efb6e1cc6
children 0750f11152fe
line wrap: on
line diff