Refactor to do diff per commit and only show conflicted changes in merges.