結果 : using vimdiff as git mergetool