diff tests/test-ui-config.out @ 3096:54d85098fb82

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