Skip to content

Tags: codemirror/merge

Tags

6.7.3

Toggle 6.7.3's commit message 
Version 6.7.3

### Bug fixes

Fix an issue where the last line of a deleted chunk, if there is no text on it, was collapsed by the browser and not visible.

6.7.2

Toggle 6.7.2's commit message 
Version 6.7.2

### Bug fixes

Fix a bug in `presentableDiff` that could cause it to produce corrupted diffs.

6.7.1

Toggle 6.7.1's commit message 
Version 6.7.1

### Bug fixes

Improve the way `presentableDiff` aligns changes to line boundaries when possible.

6.7.0

Toggle 6.7.0's commit message 
Version 6.7.0

### New features

`unifiedMergeView` now supports the `collapseUnchanged` option the way the split view does.

6.6.7

Toggle 6.6.7's commit message 
Version 6.6.7

### Bug fixes

Fix a bug in the way spacers were inserted at the top of the viewport.

6.6.6

Toggle 6.6.6's commit message 
Version 6.6.6

### Bug fixes

Improve vertical alignment of huge unchanged chunks in the side-by-side view.

6.6.5

Toggle 6.6.5's commit message 
Version 6.6.5

### Bug fixes

Fix an issue that would corrupt the text displayed for some deleted lines in the unified merge view.

6.6.4

Toggle 6.6.4's commit message 
Version 6.6.4

### Bug fixes

Fix syntax and change highlighting in deleted lines in the unified merge view.

6.6.3

Toggle 6.6.3's commit message 
Version 6.6.3

### Bug fixes

Fix `originalDocChangeEffect` to apply the changes to the appropriate document.

6.6.2

Toggle 6.6.2's commit message 
Version 6.6.2

### Bug fixes

Restore the default scan limit when diffing for chunks, which looks like it was accidentally dropped when it was made configurable in 6.3.0.