Split git-diffmerge to get mergetool working.