Merge branch 'jh/strbuf-read-use-read-in-full'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"