summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordana <dana@dana.is>2026-05-16 19:55:00 -0500
committerdana <dana@dana.is>2026-05-16 19:55:04 -0500
commitb2dc18b5b59d990bb72755792cbdcec3a64936cf (patch)
tree70b8b3da586d841256e4850e0d4b7ae9bc2e6de7
parentgithub #169: update change log (diff)
downloadzsh-b2dc18b5b59d990bb72755792cbdcec3a64936cf.tar
zsh-b2dc18b5b59d990bb72755792cbdcec3a64936cf.tar.gz
zsh-b2dc18b5b59d990bb72755792cbdcec3a64936cf.tar.bz2
zsh-b2dc18b5b59d990bb72755792cbdcec3a64936cf.tar.lz
zsh-b2dc18b5b59d990bb72755792cbdcec3a64936cf.tar.xz
zsh-b2dc18b5b59d990bb72755792cbdcec3a64936cf.tar.zst
zsh-b2dc18b5b59d990bb72755792cbdcec3a64936cf.zip
unposted: zsh-merge-changelog: find even more contextHEADmaster
mikael posted an even larger batch of changes that broke this assumption again
-rw-r--r--ChangeLog3
-rwxr-xr-xUtil/zsh-merge-changelog2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d56ec94f5..290bfbfe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2026-05-16 dana <dana@dana.is>
+ * unposted: Util/zsh-merge-changelog: zsh-merge-changelog: find
+ even more context
+
* github #169: Completion/Unix/Command/_darcs: remove _darcs
* github #169: Completion/Unix/Command/_darcs: update _darcs
diff --git a/Util/zsh-merge-changelog b/Util/zsh-merge-changelog
index 5a79db85e..053f02184 100755
--- a/Util/zsh-merge-changelog
+++ b/Util/zsh-merge-changelog
@@ -30,7 +30,7 @@ main() {
local diff line ctx_after header data datb idx color
local -a out orig
- diff=$( git diff --no-index -U50 -- $1 $3 )
+ diff=$( git diff --no-index -U200 -- $1 $3 )
for line in ${${(f)diff}[5,-1]}; do
case $line in