comparison templates/map-cmdline.default @ 2827:56f99f5aab34

Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents 8f565af14095
children e18c3d08528d
comparison
equal deleted inserted replaced
2826:3aeab7bb5adc 2827:56f99f5aab34