mergetools / gvimdiff3on commit Merge branch 'jk/config-no-ungetc-eof' into maint (2250406)
   1. "$MERGE_TOOLS_DIR/vimdiff"