mergetools / gvimdiffon commit Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint (43240cb)
   1. "$MERGE_TOOLS_DIR/vimdiff"