summaryrefslogtreecommitdiff
path: root/apply.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-11-10 18:02:15 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-11-10 18:02:15 +0900
commiteff313f8a7ff64cb3097d185c55f5ce7271f4ee9 (patch)
treea33a22e1d92e607654fb64fb3ab04ffd1786b4cd /apply.h
parentMerge branch 'sg/dir-trie-fixes' (diff)
parentapply: respect merge.conflictStyle in --3way (diff)
downloadtgif-eff313f8a7ff64cb3097d185c55f5ce7271f4ee9.tar.xz
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
Diffstat (limited to 'apply.h')
0 files changed, 0 insertions, 0 deletions