Merge branch 'tr/maint-word-diff-regex-sticky'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:34 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:34 +0000 (22:51 -0700)
The regexp configured with wordregex was incorrectly reused across files.

By Thomas Rast (2) and Johannes Sixt (1)
* tr/maint-word-diff-regex-sticky:
  diff: tweak a _copy_ of diff_options with word-diff
  diff: refactor the word-diff setup from builtin_diff_cmd
  t4034: diff.*.wordregex should not be "sticky" in --word-diff

1  2 
diff.c

diff --cc diff.c
Simple merge