diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:31 -0800 |
| commit | 932b867be0cec606ec7355fc25de13ace42f4c71 (patch) | |
| tree | c1731816dc6bc7dbfc747bc0a5dfd441f0563b57 /diff.h | |
| parent | 20b3bc155864730380e8186f7d71ee2196a79603 (diff) | |
| parent | d173e799ea8fae7d6e4649b763d32d5f0ba82011 (diff) | |
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.h | 3 |
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; }; |