danielbeardsley/cimpler — pull request #40 by danielbeardsley (2013-09-27 19:59:13+00:00)
Title: Tests: add test for merge failure to git-build-test

Need to make sure that merge failures are reported correctly.