Merge branch 'da/difftool-dir-diff-fix' into next
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"