Merge branch 'da/difftool-git-files' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"