Skip to content

Commit 977059a

Browse files
committed
v2.0.0
1 parent 83f1265 commit 977059a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

CHANGELOG.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ _Breaking changes, which may affect downstream projects, are marked with a_ :war
1919

2020

2121
## 2.0.0
22-
##### 2017-nov-21
22+
##### 2020-apr-08
2323

24-
* :warning: `invertPatch` now returns a copy instead of modifying patch in place ([#33])
25-
* :warning: `diff3Merge`, `merge`, `mergeDigIn` now accept options object
26-
* :warning: Split strings on whitespace by default, use `stringSeparator` option to change ([#9])
27-
* :warning: `diff3MergeIndices` renamed to `diff3MergeRegions`
24+
* :warning: Several breaking changes:
25+
* `invertPatch` now returns a copy instead of modifying patch in place ([#33])
26+
* `diff3Merge`, `merge`, `mergeDigIn` now accept `options` object instead of `excludeFalseConflicts` argument
27+
* Strings are split on whitespace by default. Use `stringSeparator` option to override this behavior. ([#9])
28+
* `diff3MergeIndices` renamed to `diff3MergeRegions`
2829
* Add test coverage for everything ([#3])
2930

3031
[#33]: https://github.com/bhousel/node-diff3/issues/33

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-diff3",
3-
"version": "1.0.0",
3+
"version": "2.0.0",
44
"license": "MIT",
55
"repository": "bhousel/node-diff3",
66
"author": "Bryan Housel <[email protected]>",

0 commit comments

Comments
 (0)