Code

Merge branch 'tr/diff-words-test' into pu
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
commitfcb90702baf08a3deb5c1966aa19125a07a0c30f
tree89ff0bf6de67f23be4eda6582002881b58676ef8
parent27d8082f867b4a8fa284d3eb709c865c13478b66
parent5269edf1702b7375a287d5bbbb3c1b1f3a8aa765
Merge branch 'tr/diff-words-test' into pu

* 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