Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge5 @ 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 | 39eb64b23cb5 |
children | 41989e55fa37 |