Merge branch 'jc/whitespace-incomplete-line'

Fix whitespace correction for new-style empty context lines.

* jc/whitespace-incomplete-line:
  apply: fix new-style empty context line triggering incomplete-line check

diff --cc apply.c
Simple merge