Merge branch 'tr/word-diff'
* tr/word-diff: diff: add --word-diff option that generalizes --color-words Conflicts: diff.c
Junio C Hamano committed
May 21, 2010 at 04:02 UTC
1bdd46cd3a2fe1e0aeb965fb0edb493064e24495
No changes.