diff -r 73fdc8bd3ed8 -r ea7b982b6c08 tests/test-simplemerge-cmd.out
Binary file tests/test-simplemerge-cmd.out has changed