diff tests/test-nested-repo @ 4674:723e0ddb6ada

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