view tests/test-merge-revert.out @ 1399:9a70776e355e

Try to use ini-file in the same directory as the exe as the default on NT.
author Zbynek Winkler <zwin@users.sourceforge.net>
date Tue, 18 Oct 2005 17:57:27 -0700
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

1:3aa14bbc23d9
0:8633637036c1
3aa14bbc23d9 tip
8633637036c1
8633637036c1+
8633637036c1
3aa14bbc23d9 tip
merging file1
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip