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

* bc/maint-diff-hunk-header-fix: diff hunk pattern: fix misconverted "\{" tex macro introducers Conflicts: diff.c