From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Mar 2024 22:38:54 +0000 (-0800)
Subject: Merge branch 'ps/difftool-dir-diff-exit-code' into HEAD
X-Git-Tag: v2.45.0-rc0~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a87469cc99408d515569ec490726eededbcfa063;p=thirdparty%2Fgit.git

Merge branch 'ps/difftool-dir-diff-exit-code' into HEAD

"git difftool --dir-diff" learned to honor the "--trust-exit-code"
option; it used to always exit with 0 and signalled success.

* ps/difftool-dir-diff-exit-code:
  git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`
---

a87469cc99408d515569ec490726eededbcfa063