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

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