X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=e9e3d44c674a39bb1912ca366ca12512dfb4d2c7;hb=refs%2Fheads%2Fmaster;hp=cb687436a0ddb9a08fc1a9e9cec569233284e01f;hpb=2c54517c1cdbcfe921489407c28c72d0093ab385;p=git.git diff --git a/diff.h b/diff.h index cb687436a..e9e3d44c6 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,