Merge pull request #114 from wting/wting_support_diff3_conflictstyle

Add diff3 conflictstyle support for git merge conflicts.