diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:17 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:17 -0700 |
commit | 1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 (patch) | |
tree | 9fa257f211ffb509cb07dac585f5a80b433d795c /contrib | |
parent | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' (diff) | |
parent | diff: add --word-diff option that generalizes --color-words (diff) | |
download | tgif-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.tar.xz |
Merge branch 'tr/word-diff'
* tr/word-diff:
diff: add --word-diff option that generalizes --color-words
Conflicts:
diff.c
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions