diff mercurial/util.py @ 4674:723e0ddb6ada

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