comparison tests/test-simplemerge.py.out @ 11315:666b62c52767

test-branch-option: Updated output to match rev 3f1409082720
author Jan Sorensen <js@aragost.com>
date Wed, 09 Jun 2010 17:22:59 +0200
parents 2e3c54fb79a3
children f18830651811
comparison
equal deleted inserted replaced
11314:c34dcc085da6 11315:666b62c52767