diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:15 -0700 |
| commit | 86c340e08287c0faad8871207787e5819f22a7d5 (patch) | |
| tree | ee05a1f8d8fdf038e385de68ecc107793c123eb5 /diff.h | |
| parent | 9eefd8ae8a955f470d931c13b8711d98f4e9d56e (diff) | |
| parent | 307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (diff) | |
| download | git-86c340e08287c0faad8871207787e5819f22a7d5.tar.gz | |
Merge branch 'jc/diff-algo-cleanup'
Resurrects the preparatory clean-up patches from another topic that was
discarded, as this would give a saner foundation to build on diff.algo
configuration option series.
* jc/diff-algo-cleanup:
xdiff: PATIENCE/HISTOGRAM are not independent option bits
xdiff: remove XDL_PATCH_* macros
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -91,6 +91,8 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag) +#define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag) + enum diff_words_type { DIFF_WORDS_NONE = 0, DIFF_WORDS_PORCELAIN, |