tests/test-parseindex2.py.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 06 Mar 2011 15:21:50 +0100
branchstable
changeset 13541 919174c0aaff
parent 7110 75fdc39b6172
permissions -rw-r--r--
Improve unresolved merge conflicts warning (issue2681) Suggested by Antoine Pitrou <pitrou@free.fr>

done