diff tests/test-merge5 @ 4674:723e0ddb6ada

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