diff Makefile @ 3314:ecc1bf27378c

merge: unify merge and copy actions
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:41:55 -0500
parents c51fad25e59e
children 2ab464771b7d 1a7794525c2b
line wrap: on
line diff