diff tests/test-up-local-change.out @ 3096:54d85098fb82

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