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

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