Skip to content

Commit c6f4378

Browse files
Delete merge.js (#596)
1 parent 2177408 commit c6f4378

File tree

4 files changed

+1
-1708
lines changed

4 files changed

+1
-1708
lines changed

release-notes.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* the README now correctly documents the tokenization behaviour (it was wrong before)
1010
- [#581](https://github.com/kpdecker/jsdiff/pull/581) - **fixed some regex operations used for tokenization in `diffWords` taking O(n^2) time** in pathological cases
1111
- [#595](https://github.com/kpdecker/jsdiff/pull/595) - **fixed a crash in patch creation functions when handling a single hunk consisting of a very large number (e.g. >130k) of lines**. (This was caused by spreading indefinitely-large arrays to `.push()` using `.apply` or the spread operator and hitting the JS-implementation-specific limit on the maximum number of arguments to a function, as shown at https://stackoverflow.com/a/56809779/1709587; thus the exact threshold to hit the error will depend on the environment in which you were running JsDiff.)
12+
- [#596](https://github.com/kpdecker/jsdiff/pull/596) - **removed the `merge` function**. Previously JsDiff included an undocumented function called `merge` that was meant to, in some sense, merge patches. It had at least a couple of serious bugs that could lead to it returning unambiguously wrong results, and it was difficult to simply "fix" because it was [unclear precisely what it was meant to do](https://github.com/kpdecker/jsdiff/issues/181#issuecomment-2198319542). For now, the fix is to remove it entirely.
1213

1314
## 7.0.0
1415

src/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {diffArrays} from './diff/array';
2727

2828
import {applyPatch, applyPatches} from './patch/apply';
2929
import {parsePatch} from './patch/parse';
30-
import {merge} from './patch/merge';
3130
import {reversePatch} from './patch/reverse';
3231
import {structuredPatch, createTwoFilesPatch, createPatch, formatPatch} from './patch/create';
3332

@@ -56,7 +55,6 @@ export {
5655
applyPatch,
5756
applyPatches,
5857
parsePatch,
59-
merge,
6058
reversePatch,
6159
convertChangesToDMP,
6260
convertChangesToXML,

0 commit comments

Comments
 (0)