summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:17 -0700
commit1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 (patch)
tree9fa257f211ffb509cb07dac585f5a80b433d795c /contrib/emacs
parentMerge branch 'sp/maint-describe-tiebreak-with-tagger-date' (diff)
parentdiff: add --word-diff option that generalizes --color-words (diff)
downloadtgif-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/emacs')
0 files changed, 0 insertions, 0 deletions