diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:39:15 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-06 17:39:15 -0400 |
| commit | 122512967e6184b1888a63ea2b6ed9ada3046b28 (patch) | |
| tree | 91a2c08868d550b5ce21efd7176c4d2d634bc44f /t/t7800-difftool.sh | |
| parent | 5b1c746c352e85211770e5cbd26a433b3affd3b4 (diff) | |
| parent | abd4d67ab0f84fff703fa14d9eebfd287b42daeb (diff) | |
| download | git-122512967e6184b1888a63ea2b6ed9ada3046b28.tar.gz | |
Sync with 2.30.6
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 3e041e83ae..77db028208 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -629,6 +629,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' ' test_expect_success 'difftool properly honors gitlink and core.worktree' ' test_when_finished rm -rf submod/ule && + test_config_global protocol.file.allow always && git submodule add ./. submod/ule && test_config -C submod/ule diff.tool checktrees && test_config -C submod/ule difftool.checktrees.cmd '\'' |