Merge branch 'tr/diff-words-test'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
commit1bb4abeff7e541ccfd7c87f5369b090829346e68
tree7e9dae7f6a5aba1d5241851bd46c6f7f458ebaf6
parentfc180d98a20b6270ec25ca19c8d18a0a1286fe15
parent5269edf1702b7375a287d5bbbb3c1b1f3a8aa765
Merge branch 'tr/diff-words-test'

* 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