Merge branch 'jc/report-path-error-to-dir'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"