diff tests/test-hgrc @ 3096:54d85098fb82

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