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

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