| commit | 7b90ed59fab1b288b4a9ac888d1c5a194a66c812 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:34:43 +0000 (26 10:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:34:44 +0000 (26 10:34 -0700) | ||
| tree | f64d4a88e69cc3c65ee0dc2c57ad532a4c25a05e | treesnapshot (tar.gz zip) |
| parent | 058432635bba2e0b282725865437fbd57ddfa02e | commitdiff |
| parent | 6440d3417c1d51a20014d4b6fc6c59bacfa87dab | commitdiff |
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
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
| diff.c | diff1 | diff2 | blobhistory |