From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 May 2024 16:52:54 +0000 (-0700)
Subject: Merge branch 'rs/external-diff-with-exit-code'
X-Git-Tag: v2.46.0-rc0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=068df18c90c335ebe28bda285e742a6408eec3b5;p=thirdparty%2Fgit.git

Merge branch 'rs/external-diff-with-exit-code'

The "--exit-code" option of "git diff" command learned to work with
the "--ext-diff" option.

* rs/external-diff-with-exit-code:
  diff: fix --exit-code with external diff
  diff: report unmerged paths as changes in run_diff_cmd()
---

068df18c90c335ebe28bda285e742a6408eec3b5