fix: merge editor not support wordwrap

[Ricbet]

Types

• 🐛 Bug Fixes

Background or solution

🤖 Generated by Copilot at cb3acd2

• Import the IDiffEditorConstructionOptions type from @opensumi/monaco-editor-core to use a more accurate type for the mergedOptions variable in the createMergeEditor method (link)
• Set the wordWrap option to 'off' in the mergedOptions variable to fix a bug that causes incorrect diff indicators in the merge editor (link)

merge editor 不支持 wordWrap 配置

Changelog

🤖 Generated by Copilot at cb3acd2

This pull request enhances the merge editor feature of the editor collection service. It uses a more specific type for the editor options and disables word wrapping for better diff visibility.

[codecov]

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (462c7c0) 57.66% compared to head (cb3acd2) 57.66%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2836      +/-   ##
==========================================
- Coverage   57.66%   57.66%   -0.01%     
==========================================
  Files        1336     1336              
  Lines       83923    83923              
  Branches    17455    17455              
==========================================
- Hits        48398    48397       -1     
- Misses      32288    32290       +2     
+ Partials     3237     3236       -1     

Flag	Coverage Δ
jsdom	52.68% <0.00%> (-0.01%)	⬇️
node	16.78% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...es/editor/src/browser/editor-collection.service.ts	65.64% <0.00%> (ø)

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.