Git diff reporter now handles merge conflict format of diff

When resolving a merge conflict (from either `git merge` or `git rebase`), `git diff` uses a different format, causing an exception (as reported in #41).   This update adds logic to handle the alternate format.

Reviewer: @cpennington (thanks for catching this!)