view tests/test-merge2.out @ 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 b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b