Merge branch 'upstream-development' into cmder4win

* upstream-development:
  CHANGELOG.md
  CHANGELOG.md

Author: daxgames

CHANGELOG.md

@@ -2,11 +2,15 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fixes #2940
+
 ### Adds
 
 - Cmder for Windows
     - Uses Windows and Git for Windows Native Terminals.
-    - Does not contain a terminal emulator like COnEmu or Windows Terminal..
+    - Does not contain a terminal emulator like ConEmu or Windows Terminal.
 
 ## [1.3.20](https://github.com/cmderdev/cmder/tree/v1.3.20) (2022-03-18)