mergetools / gvimdiff2on commit Sync with v1.8.1.4 (b3600c3)
   1. "$MERGE_TOOLS_DIR/vimdiff"