Merge branch 'rs/use-strbuf-complete-line'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"