X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxdiff.h;h=4da052a3fff6768fca05b2f3399c5d87ec1daa2e;hb=ab69e3e43a12cf02505f3e9e561c49c1fe8a81a6;hp=361f80231905c66b642dcc764eeea32e7814ba07;hpb=2b5189e51855312a91dd23b5e7311c48944bc382;p=git.git diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 361f80231..4da052a3f 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -32,6 +32,7 @@ extern "C" { #define XDF_IGNORE_WHITESPACE (1 << 2) #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) +#define XDF_PATIENCE_DIFF (1 << 5) #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) #define XDL_PATCH_NORMAL '-'