Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
range-diff: make --dual-color the default mode
[gitweb.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index e6c857abf4e12eb5d05f537dc8f4fb2675a82d59..ea8ecae0417b76645a706ae21297bf6a134ea3c9 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-1299,6
+1299,7
@@
static void emit_diff_symbol_from_struct(struct diff_options *o,
set = diff_get_color_opt(o, DIFF_FRAGINFO);
else if (c != '+')
set = diff_get_color_opt(o, DIFF_CONTEXT);
+ flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK;
}
emit_line_ws_markup(o, set, reset, line, len, set_sign, '+',
flags & DIFF_SYMBOL_CONTENT_WS_MASK,