Merge branch 'tb/complete-diff-ignore-blank-lines'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"