diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-14 01:30:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 21:40:42 -0800 |
| commit | 859f9c45814afae3250424946e2156ea366224f7 (patch) | |
| tree | bb5f2fc60eabb80011c758ea6961d37a754b6e96 /xdiff/xdiff.h | |
| parent | 44478d99ee0b2c219a733545efe0cb422658bf60 (diff) | |
| download | git-859f9c45814afae3250424946e2156ea366224f7.tar.gz git-859f9c45814afae3250424946e2156ea366224f7.tar.xz | |
teach diff machinery about --ignore-space-at-eol
`git diff --ignore-space-at-eol` will ignore whitespace at the
line ends.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index fa409d523..e874a7c46 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -31,7 +31,8 @@ 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 XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) +#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) #define XDL_PATCH_NORMAL '-' #define XDL_PATCH_REVERSE '+' |