view tests/test-merge4.out @ 2385:5d895018ef42

The line used to ignore the setup file for win32 is a regexp but it was after a "syntax: glob"
author Marco Barisione <marco@barisione.org>
date Mon, 22 May 2006 16:47:40 +0200
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)