Support hunks with additional context in the header
Merge pull request #2 from mulby/fix-context-in-hunk-header

diff-parse can't parse https://github.com/edx/edx-platform/pull/4514.diff