Merge branch 'jc/conflict-marker-size' into maint

* jc/conflict-marker-size:
  diff --check: honor conflict-marker-size attribute

diff --cc diff.c
Simple merge

diff --cc t/t4017-diff-retval.sh
Simple merge