diff tests/test-merge1 @ 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 e506c14382fd
children 49966b5ab16f
line wrap: on
line diff