Merge branch 'sb/prepare-revision-walk-error-check'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"