From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:34:43 +0000 (-0700)
Subject: Merge branch 'tr/maint-word-diff-regex-sticky' into maint
X-Git-Tag: v1.7.10.1~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b90ed59fab1b288b4a9ac888d1c5a194a66c812;p=git.git

Merge branch 'tr/maint-word-diff-regex-sticky' into maint

The regexp configured with diff.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
---

7b90ed59fab1b288b4a9ac888d1c5a194a66c812