This fixes a bug where even if `merge.conflictStyle = diff3`, running
`git apply --3way` would not output the base.

Patches 1-3 are general cleanup for t4108, 4 demonstrates the bug and 5
actually fixes it.

Denton Liu (5):
  t4108: replace create_file with test_write_lines
  t4108: remove git command upstream of pipe
  t4108: use `test_config` instead of `git config`
  t4108: demonstrate bug in apply
  apply: respect merge.conflictStyle in --3way

 apply.c                   |  2 +-
 t/ | 96 +++++++++++++++++++++------------------
 2 files changed, 53 insertions(+), 45 deletions(-)


Reply via email to