diff contrib/hgdiff @ 3096:54d85098fb82

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