diff Makefile @ 2827:56f99f5aab34

Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents c51fad25e59e
children 2ab464771b7d 1a7794525c2b
line wrap: on
line diff