Andrew's git / gitweb.git / blobdiff
?
Sync with maint
[gitweb.git] / t / t9114-git-svn-dcommit-merge.sh
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index f524d2f383212c7d5fb02103cc08c3cdde2519fc..d33d7140060613fbec4c45dc8d2c86394d64b4fa 100755 (executable)
--- a/t/t9114-git-svn-dcommit-merge.sh
+++ b/t/t9114-git-svn-dcommit-merge.sh
@@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' '
        echo friend > README &&
        cat tmp >> README &&
        git commit -a -m "friend" &&
-       git pull . merge
+       git merge merge
        '
 
 test_debug 'gitk --all & sleep 1'