Sync with maint

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 99caa42f5cdc199504d1c5fad442d8f8036e376e..c9d105d70725b9a97d5a9518e83c615821e91c23 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -92,7 +92,7 @@ test_expect_success 'blame 2 authors + 1 branch2 author' '
 '
 
 test_expect_success 'merge branch1 & branch2' '
-       git pull . branch1
+       git merge branch1
 '
 
 test_expect_success 'blame 2 authors + 2 merged-in authors' '