Merge branch 'tr/diff-words-test' into next
commitd3466655d2885e3e0edbf8f48e35c183bc95c3af
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800)
tree2530cf95a401967fa47b8cc4871ef8bf154f03f3
parent5bd48f8555dc8ef4ce44142950e6abbc6b0b58d7
parent5269edf1702b7375a287d5bbbb3c1b1f3a8aa765
Merge branch 'tr/diff-words-test' into next

* tr/diff-words-test:
  t4034 (diff --word-diff): add a minimum Perl drier test vector
  t4034 (diff --word-diff): style suggestions
  userdiff: simplify word-diff safeguard
  t4034: bulk verify builtin word regex sanity
userdiff.c