![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 08:01:56 +0000 (00:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 08:01:56 +0000 (00:01 -0800) | ||
| commit | d404a3e1a5588fa075e4fae6679603a5add2e4df | |
| tree | 499295d3bfe889ac42d11a0cd7e7a26fb9d40225 | tree | snapshot |
| parent | ee16339d044bf594d7e6f6d178c03d8c0bff20fb | commit | diff |
| parent | 76fd28283f7eeea246a06994edd43ab60e59d853 | commit | 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
* 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
| diff.c | diff1 | | diff2 | | blob | history |