diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-26 21:28:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-26 21:28:42 (GMT) |
| commit | 2cc06a0500b4b69e8563f76c42306e36b1f0aabf (patch) | |
| tree | 0a5a66efedea7a8c4884fb9a4588a330f77538cc /xdiff/xdiff.h | |
| parent | 57be46fd213b448f66b1470187109e7d6ad6f475 (diff) | |
| parent | 0d21efa51cc7de5250d5da46bceacda78ba35373 (diff) | |
| download | git-2cc06a0500b4b69e8563f76c42306e36b1f0aabf.zip git-2cc06a0500b4b69e8563f76c42306e36b1f0aabf.tar.gz git-2cc06a0500b4b69e8563f76c42306e36b1f0aabf.tar.bz2 | |
Merge branch 'js/diff'
* js/diff:
Teach diff about -b and -w flags
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 2540e8a..2ce10b4 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -29,6 +29,9 @@ extern "C" { #define XDF_NEED_MINIMAL (1 << 1) +#define XDF_IGNORE_WHITESPACE (1 << 2) +#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) +#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE) #define XDL_PATCH_NORMAL '-' #define XDL_PATCH_REVERSE '+' |