![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 00:41:29 +0000 (16:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 00:41:29 +0000 (16:41 -0800) | ||
| commit | 002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc | |
| tree | 4cc388911d3a2e414ea48e6b52e489efa792c9ac | tree | snapshot |
| parent | 934c042c9cf09a14762b3fa094f1ba15ec721161 | commit | diff |
| parent | 76fd28283f7eeea246a06994edd43ab60e59d853 | commit | diff |
Merge branch 'js/maint-diff-color-words'
* 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 |