diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-07 13:37:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-07 13:37:32 -0700 |
| commit | e3c76dbd0f7531eaed3ca8ec0000f03499839304 (patch) | |
| tree | abfeb18cc08e1465390443e12ae7c3d8c7b1cd5b /xdiff-interface.h | |
| parent | 0707a9d6f200bbafc02d13dd7f2c12bb795999f6 (diff) | |
| parent | 2c3fa66f3577d1305fb0fac5a181261fb2597859 (diff) | |
| download | git-e3c76dbd0f7531eaed3ca8ec0000f03499839304.tar.gz | |
Merge branch 'jc/diff-mark'
* jc/diff-mark:
diff: honor binariness specified in attributes
Fix configuration syntax to specify customized hunk header patterns.
Per-path attribute based hunk header selection.
Future-proof source for changes in xdemitconf_t
Introduce diff_filespec_is_binary()
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 536f4e4d97..fb742dbb6b 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -20,4 +20,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); + #endif |