Merge branch 'jt/avoid-prefetch-when-able-in-diff'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"