diff mercurial/lsprof.py @ 2552:bb403d427974

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:28:31 +0200
parents 976b6b2a1613
children 30c40ba10963
line wrap: on
line diff