diff tests/test-rawcommit1 @ 2827:56f99f5aab34

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