diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:34 -0700 |
| commit | 3bec29bb07b616ca7227e6e20d415b69967809a9 (patch) | |
| tree | 324d6fe70f2aa52f027ab432ae947dbe66dd6a72 /combine-diff.c | |
| parent | Merge branch 'jn/diffstat-tests' (diff) | |
| parent | diff: tweak a _copy_ of diff_options with word-diff (diff) | |
| download | git-3bec29bb07b616ca7227e6e20d415b69967809a9.tar.gz git-3bec29bb07b616ca7227e6e20d415b69967809a9.zip | |
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
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions