branch: elpa/cider
commit b9e1cc26e2afda003a4b6c1f2a26e04f1c45f3d0
Author: Bozhidar Batsov <bozhi...@batsov.dev>
Commit: Bozhidar Batsov <bozhi...@batsov.dev>
[#2946] Move the changelog entry where it belongs
---
CHANGELOG.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dc22ed4ea..2ee271ea22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
## master (unreleased)
+### New features
+
+- [#2946](https://github.com/clojure-emacs/cider/issues/2946): Add custom var
`cider-merge-sessions` to allow combining sessions in two different ways:
Setting `cider-merge-sessions` to `'host` will merge all sessions associated
with the same host within a project. Setting it to `'project` will combine all
sessions of a project irrespective of their host.
+
## 1.4.1 (2022-05-25)
## Changes
@@ -17,8 +21,6 @@ JVM-specific code outside of JVM Clojure.
* Do not always perform `undef-all`. Undef only with `C-u` prefix.
* Fix extraction of namespace name.
-* [#2946](https://github.com/clojure-emacs/cider/issues/2946): Add custom var
`cider-merge-sessions` to allow combining sessions in two different ways:
Setting `cider-merge-sessions` to `'host` will merge all sessions associated
with the same host within a project. Setting it to `'project` will combine all
sessions of a project irrespective of their host.
-
## 1.4.0 (2022-05-02)
## New features
