summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-12 19:24:47 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-12 19:24:47 -0700
commitedbda4d6af7404c97c62ab6af86edf525020cf51 (patch)
tree4527bc530f43e5a46adca3b62bd8cb8c07c659c7 /diff.h
parent6295ac347acab0f100bc143effd28d3b0bbff739 (diff)
parentf59a59e22f0005d799fe1d40e0c1f7e5c1f68b76 (diff)
downloadgit-edbda4d6af7404c97c62ab6af86edf525020cf51.tar.gz
Merge branch 'js/color-diff'
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 2cced530fa..b007240a5d 100644
--- a/diff.h
+++ b/diff.h
@@ -46,7 +46,8 @@ struct diff_options {
full_index:1,
silent_on_remove:1,
find_copies_harder:1,
- color_diff:1;
+ color_diff:1,
+ color_diff_words:1;
int context;
int break_opt;
int detect_rename;