| commit | aa76ae4905c28e264f0affc58e36c1db692fa881 | |
| author | Denton Liu <liu.denton@gmail.com> | |
| Wed, 23 Oct 2019 23:32:36 +0000 (23 16:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 24 Oct 2019 02:32:53 +0000 (24 11:32 +0900) | ||
| tree | bdd23c41bd03d7c668bfb94e5c4360fbbf023040 | treesnapshot (tar.gz zip) |
| parent | 95806205cd7013f524b6a7f10afc8542ab0c1929 | commitdiff |
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 <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t4108-apply-threeway.sh | diffblobblamehistory |