comparison setup.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 82cef38fea56
children 3dba9ec89164
comparison
equal deleted inserted replaced
2826:3aeab7bb5adc 2827:56f99f5aab34