mergetools / vimdiff2on commit Merge remote-tracking branch 'git-po/maint' (adf9927)
   1. "$MERGE_TOOLS_DIR/vimdiff"