You can build a mergetool (https://git-scm.com/docs/git-mergetool)