Merge branch 'ta/config-add-to-empty-or-true-fix'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"