mergetools / gvimdiffon commit Merge branch 'tb/core-eol-fix' into maint (7dcbf89)
   1. "$MERGE_TOOLS_DIR/vimdiff"