diff mercurial/packagescan.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 c4325f0a9b91
children 345bac2bc4ec 0171a5432621
line wrap: on
line diff