Code

Merge branch 'js/maint-diff-color-words'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:41:29 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:41:29 +0000 (16:41 -0800)
commit002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc
tree4cc388911d3a2e414ea48e6b52e489efa792c9ac
parent934c042c9cf09a14762b3fa094f1ba15ec721161
parent76fd28283f7eeea246a06994edd43ab60e59d853
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
diff.c