Andrew's git / gitweb.git / diff
?
Merge branch 'js/maint-diff-color-words' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 08:01:56 +0000 (00:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 08:01:56 +0000 (00:01 -0800)
* js/maint-diff-color-words:
diff --color-words: bit of clean-up
diff --color-words -U0: fix the location of hunk headers
t4034-diff-words: add a test for word diff without context

Conflicts:
diff.c

No differences found