Merge branch 'jc/maint-combine-diff-pre-context' into maint

* jc/maint-combine-diff-pre-context:
diff -c/--cc: do not include uninteresting deletion before leading context

diff --cc combine-diff.c
Simple merge