mergetools / gvimdiff2on commit Merge branch 'master' of https://github.com/Softcatala/git-po (78a9b45)
   1. "$MERGE_TOOLS_DIR/vimdiff"