diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:34:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:34:44 -0700 |
| commit | 7b90ed59fab1b288b4a9ac888d1c5a194a66c812 (patch) | |
| tree | f64d4a88e69cc3c65ee0dc2c57ad532a4c25a05e /merge-file.h | |
| parent | 058432635bba2e0b282725865437fbd57ddfa02e (diff) | |
| parent | 6440d3417c1d51a20014d4b6fc6c59bacfa87dab (diff) | |
| download | git-7b90ed59fab1b288b4a9ac888d1c5a194a66c812.tar.gz | |
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
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions