Merge branch 'jk/oi-delta-base'

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 718014d5dead8f36b2dde6ce38de63316ec57fdb..e74b9ab1e16a9255afad32de380b69aa9e76db47 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -328,7 +328,7 @@ test_expect_success \
         git add b &&
         git commit -a -m "On branch" &&
         git checkout master &&
-        git pull . b &&
+        git merge b &&
         git tag merge_commit'
 
 test_expect_success \