![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 May 2010 11:02:17 +0000 (04:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 May 2010 11:02:17 +0000 (04:02 -0700) | ||
| commit | 1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 | |
| tree | 9fa257f211ffb509cb07dac585f5a80b433d795c | tree | snapshot |
| parent | e22d62d9151e0e51c3dc4f951fb5d88dc30482c6 | commit | diff |
| parent | 882749a04f828fccd795deec4d0bf10ba09ae549 | commit | diff |
Merge branch 'tr/word-diff'
* tr/word-diff:
diff: add --word-diff option that generalizes --color-words
Conflicts:
diff.c
* tr/word-diff:
diff: add --word-diff option that generalizes --color-words
Conflicts:
diff.c
| Documentation/diff-options.txt | diff1 | | diff2 | | blob | history |
| Documentation/gitattributes.txt | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |