v3.1.0

bhousel · bhousel · commit a94dbaa1307b · 2021-09-24T15:42:39.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,17 @@ _Breaking changes, which may affect downstream projects, are marked with a_ ⚠
 [#xxx]: https://github.com/bhousel/node-diff3/issues/xxx
 -->
 
+## 3.1.0
+##### 2021-Sep-24
+
+* Add `sideEffects: false` to `package.json` so bundlers like webpack can treeshake
+* Remove the hardcoded `\n` from conflict boundaries ([#46], [#48])
+  * Users who want to view the results of a merge will probably do something like `console.log(result.join('\n'));`, so having extra `\n` in there is unhelpful.
+
+[#46]: https://github.com/bhousel/node-diff3/issues/46
+[#48]: https://github.com/bhousel/node-diff3/issues/48
+
+
 ## 3.0.0
 ##### 2021-Jun-26
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-diff3",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "license": "MIT",
   "repository": "github:bhousel/node-diff3",
   "description": "A node.js module for text diffing and three-way-merge.",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "node-diff3",`
`3`		`- "version": "3.0.0",`
	`3`	`+ "version": "3.1.0",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"repository": "github:bhousel/node-diff3",`
`6`	`6`	`"description": "A node.js module for text diffing and three-way-merge.",`