v2.0.0

bhousel · Apr 9, 2020 · 977059a · 977059a
1 parent 83f1265
commit 977059a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,12 +19,13 @@ _Breaking changes, which may affect downstream projects, are marked with a_ :war
 
 
 ## 2.0.0
-##### 2017-nov-21
+##### 2020-apr-08
 
-* :warning: `invertPatch` now returns a copy instead of modifying patch in place ([#33])
-* :warning: `diff3Merge`, `merge`, `mergeDigIn` now accept options object
-* :warning: Split strings on whitespace by default, use `stringSeparator` option to change ([#9])
-* :warning: `diff3MergeIndices` renamed to `diff3MergeRegions`
+* :warning: Several breaking changes:
+  * `invertPatch` now returns a copy instead of modifying patch in place ([#33])
+  * `diff3Merge`, `merge`, `mergeDigIn` now accept `options` object instead of `excludeFalseConflicts` argument
+  * Strings are split on whitespace by default. Use `stringSeparator` option to override this behavior. ([#9])
+  * `diff3MergeIndices` renamed to `diff3MergeRegions`
 * Add test coverage for everything ([#3])
 
 [#33]: https://github.com/bhousel/node-diff3/issues/33

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-diff3",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "license": "MIT",
   "repository": "bhousel/node-diff3",
   "author": "Bryan Housel <bhousel@gmail.com>",