comparison tests/test-simplemerge.py @ 11841:d59a623cc4c9

Merge with stable
author Martin Geisler <mg@aragost.com>
date Fri, 13 Aug 2010 15:18:15 +0200
parents e433002acb05
children 7de7630053cb
comparison
equal deleted inserted replaced
11839:8c034517b406 11841:d59a623cc4c9