diff tests/test-conflict.out @ 1413:1c64c628d15f

Do not use 'glob' expansion by default on OS != 'nt'
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 19 Oct 2005 00:02:41 -0700
parents 5a034646e472
children 7544700fd931
line wrap: on
line diff