Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix

* bc/maint-diff-hunk-header-fix: diff: use extended regexp to find hunk headers Conflicts: diff.c