comparison tests/test-simplemerge.py @ 9594:f0c5c59d878d

merge with mpm
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sun, 11 Oct 2009 21:32:55 +0200
parents e75aab656f46
children 08a0f04b56bd
comparison
equal deleted inserted replaced
9593:c358f3e78935 9594:f0c5c59d878d