From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Jul 2024 16:59:02 +0000 (-0700)
Subject: Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'
X-Git-Tag: v2.46.0-rc0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d97b4e2358aa528f9406b3ca96981fcf89b0d11;p=thirdparty%2Fgit.git

Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'

"git diff --no-ext-diff" when diff.external is configured ignored
the "--color-moved" option.

* rs/diff-color-moved-w-no-ext-diff-fix:
  diff: allow --color-moved with --no-ext-diff
---

2d97b4e2358aa528f9406b3ca96981fcf89b0d11