Use merge-recursive in git-checkout -m (branch switching)

diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index 52dab2d484fa84b4f766d176c6d78952732d8f5b..dd9caad1c2a34a6721aafa1840916a5a7471ece8 100755 (executable)
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -17,7 +17,7 @@ git commit -m initial'
 cd "$base_dir"
 
 test_expect_success 'preparing second repository' \
-'git_clone A B && cd B &&
+'git clone A B && cd B &&
 echo second > file2 &&
 git add file2 &&
 git commit -m addition &&
@@ -27,7 +27,7 @@ git prune'
 cd "$base_dir"
 
 test_expect_success 'cloning with reference' \
-'git_clone -l -s --reference B A C'
+'git clone -l -s --reference B A C'
 
 cd "$base_dir"