tests/test-merge-revert.out
author Will <will@glozer.net>
Wed, 16 Nov 2005 20:53:16 +0100
changeset 1548 18f3224da392
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
fix bug in setup.py introduced in r1508. The 'console' argument is expected to be a list of strings, but was changed to just a string.

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