From: Junio C Hamano Date: Mon, 16 Apr 2012 05:51:34 +0000 (-0700) Subject: Merge branch 'tr/maint-word-diff-regex-sticky' X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3bec29bb07b616ca7227e6e20d415b69967809a9;p=git.git 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 --- 3bec29bb07b616ca7227e6e20d415b69967809a9