comparison hgext/win32text.py @ 2813:56f99f5aab34

Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents e58b1c9a0dec
children 30762680fcd2
comparison
equal deleted inserted replaced
2812:3aeab7bb5adc 2813:56f99f5aab34