view tests/test-merge2.out @ 2383:dec7aa404dcf

Ignore the .exe setup file for Windows
author Marco Barisione <marco@barisione.org>
date Mon, 22 May 2006 14:06:12 +0200
parents b2ae81a7df29
children 4b0c9c674707
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