From c45baa2510f190b42f26bac60baeea482d3c7942 Mon Sep 17 00:00:00 2001
From: Elliot Berman <elliotjb@elliotjb.com>
Date: Wed, 20 Aug 2025 18:01:35 -0700
Subject: github #142: Fix text for git merge --squash/--no-squash

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ChangeLog')

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
 
-- 
cgit v1.2.3-70-g09d2