diff contrib/win32/mercurial.ini @ 3096:54d85098fb82

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