From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Aug 2020 17:24:02 +0000 (-0700)
Subject: Merge branch 'en/eol-attrs-gotchas'
X-Git-Tag: v2.29.0-rc0~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4339259d5fa45160fb75d17052038ba96fb3664a;p=thirdparty%2Fgit.git

Merge branch 'en/eol-attrs-gotchas'

All "mergy" operations that internally use the merge-recursive
machinery should honor the merge.renormalize configuration, but
many of them didn't.

* en/eol-attrs-gotchas:
  checkout: support renormalization with checkout -m <paths>
  merge: make merge.renormalize work for all uses of merge machinery
  t6038: remove problematic test
  t6038: make tests fail for the right reason
---

4339259d5fa45160fb75d17052038ba96fb3664a