mergetools / gvimdiff2on commit Sync with 2.6.5 (3e9226a)
   1. "$MERGE_TOOLS_DIR/vimdiff"