diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:32:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:32:50 -0700 |
| commit | dde4af4313c6fba5269df384d97ef4fa3ab5971d (patch) | |
| tree | 0441889cf594719be3e4e6f6b7e2234171218fb6 /xdiff-interface.h | |
| parent | af9ce1ffc6de9774e90a91f27fb1febd027f74f1 (diff) | |
| parent | 45d9414fa5599b41578625961b53e18a9b9148c7 (diff) | |
| download | git-dde4af4313c6fba5269df384d97ef4fa3ab5971d.tar.gz | |
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
* bc/maint-diff-hunk-header-fix:
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
Cosmetical command name fix
Start conforming code to "git subcmd" style part 3
t9700/test.pl: remove File::Temp requirement
t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
GIT 1.6.0.2
Fix some manual typos.
Use compatibility regex library also on FreeBSD
Use compatibility regex library also on AIX
Update draft release notes for 1.6.0.2
Use compatibility regex library for OSX/Darwin
git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
Git.pm: Use File::Temp->tempfile instead of ->new
t7501: always use test_cmp instead of diff
Start conforming code to "git subcmd" style part 2
diff: Help "less" hide ^M from the output
checkout: do not check out unmerged higher stages randomly
Conflicts:
Documentation/git.txt
Documentation/gitattributes.txt
Makefile
diff.c
t/t7201-co.sh
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 558492ba38..23c49b99d1 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -16,6 +16,6 @@ int parse_hunk_header(char *line, int len, int read_mmfile(mmfile_t *ptr, const char *filename); int buffer_is_binary(const char *ptr, unsigned long size); -extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line); +extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); #endif |