summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:19:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:19:27 -0700
commit8daff716ad6caee55e04e5550137cd3bd83b9822 (patch)
treec265e6d3c6a05ce2f72b6058958f4fac14d79731 /diff.h
parentMerge branch 'ct/advise-push-default' into maint (diff)
parentxdiff: PATIENCE/HISTOGRAM are not independent option bits (diff)
downloadtgif-8daff716ad6caee55e04e5550137cd3bd83b9822.tar.xz
Merge branch 'jc/diff-algo-cleanup' into maint
* 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.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 3cc1dcf78a..e027650cb0 100644
--- a/diff.h
+++ b/diff.h
@@ -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,