Merge branch 'jk/difftool-dir-diff-edit-fix'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"