From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Sep 2008 06:51:01 +0000 (-0700)
Subject: Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
X-Git-Tag: v1.6.1-rc1~194^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd0843198fecf9faa6e82f6db15fc9c7ec31d3f4?hp=cd0843198fecf9faa6e82f6db15fc9c7ec31d3f4

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
---