git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9580620)
t4108: demonstrate bug in apply
authorDenton Liu <redacted>
Wed, 23 Oct 2019 23:32:36 +0000 (16:32 -0700)
committerJunio C Hamano <redacted>
Thu, 24 Oct 2019 02:32:53 +0000 (11:32 +0900)
commitaa76ae4905c28e264f0affc58e36c1db692fa881
treebdd23c41bd03d7c668bfb94e5c4360fbbf023040tree | snapshot
parent95806205cd7013f524b6a7f10afc8542ab0c1929commit | diff
t4108: demonstrate bug in apply

Currently, apply does not respect the merge.conflictStyle setting.
Demonstrate this by making the 'apply with --3way' test case generic and
extending it to show that the configuration of
merge.conflictStyle = diff3 causes a breakage.

Change print_sanitized_conflicted_diff() to also sanitize `|||||||`
conflict markers.

Signed-off-by: Denton Liu <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t4108-apply-threeway.sh diff | blob | history
git clone https://git.99rst.org/PROJECT