tests/test-merge-revert.out
author zbynek@alex.kolej.mff.cuni.cz
Tue, 27 Sep 2005 15:01:49 -0700
changeset 1357 94586af53d2f
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Replacing select.select() with os.fstat() which works also on windows.

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