mergetools / vimdiff2on commit Sync with 2.3.10 (6343e2f)
   1. "$MERGE_TOOLS_DIR/vimdiff"