diff hgmerge @ 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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff