diff mercurial/commands.py @ 2827:56f99f5aab34

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