diff contrib/hgdiff @ 2827:56f99f5aab34

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