From 501a75a7b308ed9631cd4802d891e6b56c06821a Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Thu, 31 Oct 2013 03:25:33 -0600 Subject: t: replace pulls with merges This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- t/t9500-gitweb-standalone-no-errors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t9500-gitweb-standalone-no-errors.sh') diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index 718014d5de..e74b9ab1e1 100755 --- 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 \ -- cgit v1.2.3