Junio C Hamano d404a3e1a5 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

2009-11-16 00:01:56 -08:00

96 KiB

Raw Permalink Blame History

View Raw