diff tests/test-merge-revert @ 4674:723e0ddb6ada

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