Tests: add test for merge failure to git-build-test

Need to make sure that merge failures are reported correctly.