diff options
author | Nicolas Zingilé <nicolas.zingile@open.eurogiciel.org> | 2014-11-17 17:01:18 +0100 |
---|---|---|
committer | Nicolas Zingilé <nicolas.zingile@open.eurogiciel.org> | 2014-11-17 17:01:18 +0100 |
commit | 98e3d8faf9eebd382f62a75c886b7e1c6a20279b (patch) | |
tree | 756eb3879157731cb1c2b50f35a744aad8b8796d /xdiff/xdiff.h | |
parent | ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad (diff) | |
download | git-98e3d8faf9eebd382f62a75c886b7e1c6a20279b.tar.gz git-98e3d8faf9eebd382f62a75c886b7e1c6a20279b.tar.bz2 git-98e3d8faf9eebd382f62a75c886b7e1c6a20279b.zip |
Imported Upstream version 2.0.1upstream/2.0.1
Diffstat (limited to 'xdiff/xdiff.h')
-rw-r--r-- | xdiff/xdiff.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 219a3bbc..c0339919 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -39,6 +39,8 @@ extern "C" { #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF) #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK) +#define XDF_IGNORE_BLANK_LINES (1 << 7) + #define XDL_EMIT_FUNCNAMES (1 << 0) #define XDL_EMIT_COMMON (1 << 1) #define XDL_EMIT_FUNCCONTEXT (1 << 2) |