Responded to code review comments

https://github.com/mhagger/git-imerge/pull/64#issuecomment-42532424