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

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