| commit | d191b2505d26e5d6ae3cd8723f1c57a8703e75ec | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:16 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:16 +0000 (4 17:50 -0700) | ||
| tree | 11fb4007665482689a32822161efd9a0620effd2 | treesnapshot (tar.gz zip) |
| parent | af2d60542a5b207a8c9ba7e140114929d0a3330f | commitdiff |
| parent | 882749a04f828fccd795deec4d0bf10ba09ae549 | commitdiff |
Merge branch 'tr/word-diff' into next
* 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 | blobhistory |
| Documentation/gitattributes.txt | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |