build(deps-dev): bump @codemirror/merge from 6.1.1 to 6.4.0

[dependabot[bot]]

Bumps @codemirror/merge from 6.1.1 to 6.4.0.

Changelog

Sourced from @​codemirror/merge's changelog.

6.4.0 (2023-12-14)

New features

The getOriginalDoc function extracts the original document from a unified merge editor.

6.3.1 (2023-12-03)

Bug fixes

Add a userEvent annotation to transactions that accept a change in the unified merge view.

Fix CSS selectors in the merge view base theme to avoid affecting the style of non-merge view editors.

6.3.0 (2023-11-16)

New features

Merge views (and Chunk building methods) now take an optional diff config object to allow precision to be configured.

6.2.0 (2023-10-06)

New features

The package now exports goToNextChunk and goToPreviousChunk commands that allow by-changed-chunk document navigation.

6.1.3 (2023-09-28)

Bug fixes

Create alignment spacers for the whole document, not just the viewport, to avoid scroll position popping and misalignment.

6.1.2 (2023-08-18)

Bug fixes

Fall back to treating entire documents as changed when they are too large to compute a diff in a reasonable timeframe.

Commits

• 39d19ae Mark version 6.4.0
• e29b7cf Export getOriginalDoc function
• df72a3a Mark version 6.3.1
• 84f7004 Narrow base theme selectors to avoid styling other editors
• 3d54249 Give accept action in unified diff view a userEvent tag
• 64ba3bb Mark version 6.3.0
• 6df4712 Make readme more complete
• 33e1998 Allow scanLimit to be configured in merge views
• d4c0024 Mark version 6.2.0
• bb4fa9a Export nextChunk and previousChunk commands
• Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

---

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

[dependabot[bot]]

Superseded by #165.