Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint

diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 79bc135bf69ea5813f0a372db6bbefa0f9a92753..5503ec067fa8e5d62b5308ceb7f538ad6e7dc81f 100755 (executable)
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -62,13 +62,13 @@ test_expect_success 'change submodule' '
 '
 
 reset_submodule_urls () {
-       local root
-       root=$(pwd) &&
        (
+               root=$(pwd) &&
                cd super-clone/submodule &&
                git config remote.origin.url "$root/submodule"
        ) &&
        (
+               root=$(pwd) &&
                cd super-clone/submodule/sub-submodule &&
                git config remote.origin.url "$root/submodule"
        )