diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:40:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:40:33 -0700 |
| commit | 6fcb384869720ed2e9ea7de1938e44c54e56a75a (patch) | |
| tree | bac64a700b43df8700e7f3c4e7d93cc0fb29d3dc /t/t7800-difftool.sh | |
| parent | 52457205a2301d66848fd965c928bc4e0360e2aa (diff) | |
| parent | 3f4ab627146fcb1e1887198f520f39fb84fde73a (diff) | |
| download | git-6fcb384869720ed2e9ea7de1938e44c54e56a75a.tar.gz | |
Merge branch 'rt/zlib-smaller-window'
* rt/zlib-smaller-window:
test: consolidate definition of $LF
Tolerate zlib deflation with window size < 32Kb
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 4048d106d4..395adfc8a9 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -10,9 +10,6 @@ Testing basic diff tool invocation . ./test-lib.sh -LF=' -' - remove_config_vars() { # Unset all config variables used by git-difftool |