Merge branch 'jk/config-no-ungetc-eof' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"