add diffconflicts script for git mergetool