Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Sep 2008 06:51:01 +0000 (23:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Sep 2008 06:51:01 +0000 (23:51 -0700)
commitcd0843198fecf9faa6e82f6db15fc9c7ec31d3f4
treea249a3382129dfa4aa572af0e7ce1fe44c5bac9c
parentdde4af4313c6fba5269df384d97ef4fa3ab5971d
parent6a6baf9b4e819a0bbfd70627f966cd7144dd8301
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
diff.c