chore(main): release 1.4.0

akinsho · May 27, 2024 · 6984fc4 · 6984fc4
1 parent faee1f3
commit 6984fc4
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.4.0](https://github.com/akinsho/git-conflict.nvim/compare/v1.3.0...v1.4.0) (2024-05-27)
+
+
+### Features
+
+* add support for git worktrees ([#81](https://github.com/akinsho/git-conflict.nvim/issues/81)) ([1371080](https://github.com/akinsho/git-conflict.nvim/commit/13710803346cfe468ce7be250d19c430866ba1bd))
+
+
+### Bug Fixes
+
+* extmarks missing from final line ([#87](https://github.com/akinsho/git-conflict.nvim/issues/87)) ([96458b8](https://github.com/akinsho/git-conflict.nvim/commit/96458b843795c6dd84f221188cccd3242328349e))
+* off-by-one error in find_position ([#86](https://github.com/akinsho/git-conflict.nvim/issues/86)) ([4ff00ae](https://github.com/akinsho/git-conflict.nvim/commit/4ff00aed1ef47d9b7ab16ca62563089c15723b14))
+
 ## [1.3.0](https://github.com/akinsho/git-conflict.nvim/compare/v1.2.2...v1.3.0) (2024-01-22)