diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 10:23:19 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 10:23:19 -0700 |
| commit | edb7e82f72106add9f2fbaf9d99d9532a72e3f91 (patch) | |
| tree | a4622ea3d53d1414acd3a20eb0098140ff864cd6 /t/t6032-merge-large-rename.sh | |
| parent | Merge branch 'mg/maint-remote-fix' into maint (diff) | |
| parent | t4018-diff-funcname: test syntax of builtin xfuncname patterns (diff) | |
| download | tgif-edb7e82f72106add9f2fbaf9d99d9532a72e3f91.tar.xz | |
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
Diffstat (limited to 't/t6032-merge-large-rename.sh')
0 files changed, 0 insertions, 0 deletions