diff Makefile @ 3096:54d85098fb82

merge: make unresolved a counter
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:39:54 -0500
parents c51fad25e59e
children 2ab464771b7d 1a7794525c2b
line wrap: on
line diff