diff: --ignore-cr-at-eol

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index cbf5d8e166541a17e9d87206bdd8965ae15f6e92..51f89262150d7ba6654a8c3d64d676290500cdd2 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -33,9 +33,11 @@ extern "C" {
 #define XDF_IGNORE_WHITESPACE (1 << 1)
 #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2)
 #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3)
+#define XDF_IGNORE_CR_AT_EOL (1 << 4)
 #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \
                              XDF_IGNORE_WHITESPACE_CHANGE | \
-                             XDF_IGNORE_WHITESPACE_AT_EOL)
+                             XDF_IGNORE_WHITESPACE_AT_EOL | \
+                             XDF_IGNORE_CR_AT_EOL)
 
 #define XDF_IGNORE_BLANK_LINES (1 << 7)