diff hgmerge @ 3096:54d85098fb82

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