Merge branch 'sb/check-return-from-read-ref' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"