diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
| commit | fc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch) | |
| tree | 59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /diff.h | |
| parent | ada5853c98c5c0ad84a990cc6ee7365a14555c0f (diff) | |
| parent | cd112cef999c59a7ca2a96c37b197d303a355924 (diff) | |
| download | git-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.gz | |
Merge branch 'js/diff'
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -32,7 +32,8 @@ struct diff_options { full_index:1, silent_on_remove:1, find_copies_harder:1, - summary:1; + summary:1, + color_diff:1; int context; int break_opt; int detect_rename; |