diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:17:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:17:16 -0700 |
| commit | b14b969ab98d5dac835e57a2b6b9e9229b2e1c97 (patch) | |
| tree | 98ae611f55619bcc45546ff33204900618abf10a /xdiff/xdiff.h | |
| parent | 27af01d552331eacf1ed2671b2b4b6ad4c268106 (diff) | |
| parent | 6486a84cb8e69ddf03b2139db3d968400e05f5b3 (diff) | |
| download | git-b14b969ab98d5dac835e57a2b6b9e9229b2e1c97.tar.gz | |
Merge branch 'rc/histogram-diff' into HEAD
* rc/histogram-diff:
xdiff/xhistogram: drop need for additional variable
xdiff/xhistogram: rely on xdl_trim_ends()
xdiff/xhistogram: rework handling of recursed results
xdiff: do away with xdl_mmfile_next()
Make test number unique
xdiff/xprepare: use a smaller sample size for histogram diff
xdiff/xprepare: skip classification
teach --histogram to diff
t4033-diff-patience: factor out tests
xdiff/xpatience: factor out fall-back-diff function
xdiff/xprepare: refactor abort cleanups
xdiff/xprepare: use memset()
Conflicts:
xdiff/xprepare.c
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 711048ea36..4beb10c678 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -33,6 +33,7 @@ extern "C" { #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) #define XDF_PATIENCE_DIFF (1 << 5) +#define XDF_HISTOGRAM_DIFF (1 << 6) #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) #define XDL_PATCH_NORMAL '-' @@ -105,7 +106,6 @@ typedef struct s_bdiffparam { #define xdl_realloc(ptr,x) realloc(ptr,x) void *xdl_mmfile_first(mmfile_t *mmf, long *size); -void *xdl_mmfile_next(mmfile_t *mmf, long *size); long xdl_mmfile_size(mmfile_t *mmf); int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, |