| commit | b3f67cd0a53ebb775165bf5ce77cf6c081a305d0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Mar 2012 22:54:57 +0000 (20 15:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Mar 2012 22:54:57 +0000 (20 15:54 -0700) | ||
| tree | 83aade8e355d50b7a246c4550780b21db8ae5e51 | treesnapshot (tar.gz zip) |
| parent | 8791b2fc08b718a06a9a9a233ed9ab38fd9acf16 | commitdiff |
| parent | 6440d3417c1d51a20014d4b6fc6c59bacfa87dab | commitdiff |
Merge branch 'tr/maint-word-diff-regex-sticky' into next
The regexp configured with wordregex was incorrectly reused across
files.
Not urgent.
* 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.
Not urgent.
* 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 |