diff Makefile @ 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 c51fad25e59e
children 2ab464771b7d 1a7794525c2b
line wrap: on
line diff