commit | d404a3e1a5588fa075e4fae6679603a5add2e4df | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Nov 16 00:01:56 2009 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Nov 16 00:01:56 2009 -0800 |
tree | 499295d3bfe889ac42d11a0cd7e7a26fb9d40225 | |
parent | ee16339d044bf594d7e6f6d178c03d8c0bff20fb [diff] | |
parent | 76fd28283f7eeea246a06994edd43ab60e59d853 [diff] |
Merge branch 'js/maint-diff-color-words' into maint * 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