Fixes typo in git_merge_error

Added test to uncover the problem if it occurs again.

Resolves #114