According to the spec, Spork should not only exit non-zero if there are merge conflicts, but it's exit status should in fact be the amount of conflicts, truncated to a maximum of 127.