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