Junio C Hamano 3bec29bb07 Merge branch 'tr/maint-word-diff-regex-sticky' ...

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

2012-04-15 22:51:34 -07:00

128 KiB

Raw Blame History

View Raw