]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d60a7 091489d)
Merge branch 'dl/apply-3way-diff3' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 03:30:24 +0000 (12:30 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 03:30:24 +0000 (12:30 +0900)
"git apply --3way" learned to honor merge.conflictsStyle
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

1  2 
apply.c patch | diff1 | diff2 | blob | history

diff --cc apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.