test-simplemerge.py.out #1