mergetools / gvimdiff2on commit Sync with 2.9.3 (2376d31)
   1. "$MERGE_TOOLS_DIR/vimdiff"