Merge branch 'tb/blame-resurrect-convert-to-git' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"