![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Apr 2012 05:51:34 +0000 (22:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Apr 2012 05:51:34 +0000 (22:51 -0700) | ||
| commit | 3bec29bb07b616ca7227e6e20d415b69967809a9 | |
| tree | 324d6fe70f2aa52f027ab432ae947dbe66dd6a72 | tree | snapshot |
| parent | 09b90fb3c065ac5ac2ad051596b036131ecedbd5 | commit | diff |
| parent | 6440d3417c1d51a20014d4b6fc6c59bacfa87dab | commit | diff |
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
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
| diff.c | diff1 | | diff2 | | blob | history |