1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 15a7fd18c..4cdb1eae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2025-09-24  Oliver Kiddle  <opk@zsh.org>
 
+	* Elliot Berman: github #142: Completion/Unix/Command/_git:
+	fix text for git merge --squash/--no-squash
+
 	* Christopher Bock: github #141 (tweaked):
 	Completion/Debian/Command/_apt: complete apt why/why-not