summaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-15 00:29:31 +0100
committerJunio C Hamano <gitster@pobox.com>2019-01-15 00:29:31 +0100
commit932b867be0cec606ec7355fc25de13ace42f4c71 (patch)
treec1731816dc6bc7dbfc747bc0a5dfd441f0563b57 /diff.h
parentMerge branch 'hn/highlight-sideband-keywords' (diff)
parentdiff: align move detection error handling with other options (diff)
downloadgit-932b867be0cec606ec7355fc25de13ace42f4c71.tar.xz
git-932b867be0cec606ec7355fc25de13ace42f4c71.zip
Merge branch 'sb/diff-color-moved-config-option-fixup'
Minor inconsistency fix. * sb/diff-color-moved-config-option-fixup: diff: align move detection error handling with other options
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 412138ba08..b512d0477a 100644
--- a/diff.h
+++ b/diff.h
@@ -225,7 +225,8 @@ struct diff_options {
/* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
#define COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE (1<<5)
- int color_moved_ws_handling;
+ #define COLOR_MOVED_WS_ERROR (1<<0)
+ unsigned color_moved_ws_handling;
struct repository *repo;
};