Merge branch 'bc/maint-diff-hunk-header-fix' into maint
commitedb7e82f72106add9f2fbaf9d99d9532a72e3f91
authorShawn O. Pearce <spearce@spearce.org>
Mon, 29 Sep 2008 17:23:19 +0000 (29 10:23 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 29 Sep 2008 17:23:19 +0000 (29 10:23 -0700)
treea4622ea3d53d1414acd3a20eb0098140ff864cd6
parente9a06f1eeb6ddd952ece71eaa87e613d715eade6
parente3bf5e43fd9db9391ebc876ef118dbb431853d69
Merge branch 'bc/maint-diff-hunk-header-fix' into maint

* bc/maint-diff-hunk-header-fix:
  t4018-diff-funcname: test syntax of builtin xfuncname patterns
  diff hunk pattern: fix misconverted "\{" tex macro introducers
  diff: use extended regexp to find hunk headers
  diff.*.xfuncname which uses "extended" regex's for hunk header selection
  diff.c: associate a flag with each pattern and use it for compiling regex
  diff.c: return pattern entry pointer rather than just the hunk header pattern

Conflicts:
Documentation/gitattributes.txt
Documentation/gitattributes.txt
diff.c