Skip to content

Commit d51a884

Browse files
committed
v2.1.0
1 parent cef516b commit d51a884

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ _Breaking changes, which may affect downstream projects, are marked with a_ :war
1616
1717
[#xxx]: https://github.com/bhousel/node-diff3/issues/xxx
1818
-->
19+
## 2.1.0
20+
##### 2020-jul-17
21+
22+
* ([#39]) Added a `mergeDiff3` function to help print out Diff3 merge result
23+
* ([#37]) Fixed error in TypeScript definition for `MergeRegion`
24+
25+
[#39]: https://github.com/bhousel/node-diff3/issues/39
26+
[#37]: https://github.com/bhousel/node-diff3/issues/37
27+
1928

2029
## 2.0.1
2130
##### 2020-may-18

0 commit comments

Comments
 (0)