diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-10-23 16:32:36 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-24 11:32:53 +0900 |
| commit | aa76ae4905c28e264f0affc58e36c1db692fa881 (patch) | |
| tree | bdd23c41bd03d7c668bfb94e5c4360fbbf023040 /t/t4150-am.sh | |
| parent | t4108: use `test_config` instead of `git config` (diff) | |
| download | tgif-aa76ae4905c28e264f0affc58e36c1db692fa881.tar.xz | |
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>
Diffstat (limited to 't/t4150-am.sh')
0 files changed, 0 insertions, 0 deletions