mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/diff-color-moved-config-option-fixup'

Browse Source 
Minor inconsistency fix.

* sb/diff-color-moved-config-option-fixup:
  diff: align move detection error handling with other options
This commit is contained in:
Junio C Hamano
2019-01-14 15:29:31 -08:00
parent 20b3bc1558 d173e799ea
commit 932b867be0
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
diff.h
View File

@ -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;
};