diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
| commit | 1bb4abeff7e541ccfd7c87f5369b090829346e68 (patch) | |
| tree | 7e9dae7f6a5aba1d5241851bd46c6f7f458ebaf6 /merge-recursive.h | |
| parent | Merge branch 'rr/fi-import-marks-if-exists' (diff) | |
| parent | t4034 (diff --word-diff): add a minimum Perl drier test vector (diff) | |
| download | tgif-1bb4abeff7e541ccfd7c87f5369b090829346e68.tar.xz | |
Merge branch 'tr/diff-words-test'
* tr/diff-words-test:
t4034 (diff --word-diff): add a minimum Perl drier test vector
t4034 (diff --word-diff): style suggestions
userdiff: simplify word-diff safeguard
t4034: bulk verify builtin word regex sanity
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions