From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2024 17:18:46 +0000 (-0700)
Subject: Merge branch 'bc/zsh-compatibility'
X-Git-Tag: v2.46.0-rc0~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2b36ab32ec9d5b6ede9b808a0986ab1cb281b42;p=thirdparty%2Fgit.git

Merge branch 'bc/zsh-compatibility'

zsh can pretend to be a normal shell pretty well except for some
glitches that we tickle in some of our scripts. Work them around
so that "vimdiff" and our test suite works well enough with it.

* bc/zsh-compatibility:
  vimdiff: make script and tests work with zsh
  t4046: avoid continue in &&-chain for zsh
---

c2b36ab32ec9d5b6ede9b808a0986ab1cb281b42