Responding to code review comments.

https://github.com/mhagger/git-imerge/pull/63#issuecomment-42529997