diff mercurial/dirstate.py @ 3233:3fd098e0902d

merge: extend file merge function for renames
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 12:04:48 -0500
parents b1f10d3223c1
children 53e843840349
line wrap: on
line diff