mergetools / vimdiff2on commit Merge branch 'merge' of https://github.com/ChrisADR/git-po into maint (c08227f)
   1. "$MERGE_TOOLS_DIR/vimdiff"