Merge branch 'master' of https://github.com/Softcatala/git-po
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"