mergetools / vimdiff2on commit Sync with 2.16.5 (e43aab7)
   1. "$MERGE_TOOLS_DIR/vimdiff"