From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Nov 2019 09:02:15 +0000 (+0900)
Subject: Merge branch 'dl/apply-3way-diff3'
X-Git-Tag: v2.25.0-rc0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eff313f8a7ff64cb3097d185c55f5ce7271f4ee9;p=thirdparty%2Fgit.git

Merge branch 'dl/apply-3way-diff3'

"git apply --3way" learned to honor merge.conflictStyle
configuration variable, like merges would.

* dl/apply-3way-diff3:
  apply: respect merge.conflictStyle in --3way
  t4108: demonstrate bug in apply
  t4108: use `test_config` instead of `git config`
  t4108: remove git command upstream of pipe
  t4108: replace create_file with test_write_lines
---

eff313f8a7ff64cb3097d185c55f5ce7271f4ee9