diff hgmerge @ 2498:1e2ec4fd16df

Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 26 Jun 2006 14:49:18 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff