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 /convert.h | |
| parent | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint (diff) | |
| parent | diff: tweak a _copy_ of diff_options with word-diff (diff) | |
| download | tgif-7b90ed59fab1b288b4a9ac888d1c5a194a66c812.tar.xz | |
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 'convert.h')
0 files changed, 0 insertions, 0 deletions