Merge branch 'bn/config-doc-tt-varnames' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"