diff tests/test-bad-pull @ 2827:56f99f5aab34

Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents d22d730c96ed
children 7012c889e8f2
line wrap: on
line diff