tests/test-merge-revert.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Mon, 13 Mar 2006 08:24:44 -0800
changeset 1937 3f6be77eda58
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
fix use of python 2.4 features.

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