From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 29 Sep 2008 17:23:19 +0000 (-0700)
Subject: Merge branch 'bc/maint-diff-hunk-header-fix' into maint
X-Git-Tag: v1.6.0.3~52
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=edb7e82f72106add9f2fbaf9d99d9532a72e3f91;p=git.git

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

edb7e82f72106add9f2fbaf9d99d9532a72e3f91
diff --cc Documentation/gitattributes.txt
index 89627688b,925963760..53da9b4f6
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -288,9 -288,9 +288,9 @@@ for paths
  *.tex	diff=tex
  ------------------------
  
- Then, you would define a "diff.tex.funcname" configuration to
 -Then, you would define "diff.tex.xfuncname" configuration to
++Then, you would define a "diff.tex.xfuncname" configuration to
  specify a regular expression that matches a line that you would
 -want to appear as the hunk header, like this:
 +want to appear as the hunk header "TEXT", like this:
  
  ------------------------
  [diff "tex"]