Junio C Hamano 4339259d5f 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

2020-08-10 10:24:02 -07:00

116 KiB

Raw Blame History

View Raw