diff contrib/hgdiff @ 4674:723e0ddb6ada

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