aboutsummaryrefslogtreecommitdiff
path: root/t/t9500-gitweb-standalone-no-errors.sh
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-10-31 03:25:33 -0600
committerJunio C Hamano <gitster@pobox.com>2013-10-31 11:12:26 -0700
commit501a75a7b308ed9631cd4802d891e6b56c06821a (patch)
tree4a31a6825838654afca7a3e42ab828a97a4f7de5 /t/t9500-gitweb-standalone-no-errors.sh
parent90f867b9a5088a2ea6f5844ae28b617821e77b28 (diff)
downloadgit-501a75a7b308ed9631cd4802d891e6b56c06821a.tar.gz
git-501a75a7b308ed9631cd4802d891e6b56c06821a.tar.xz
t: replace pulls with merges
This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9500-gitweb-standalone-no-errors.sh')
-rwxr-xr-xt/t9500-gitweb-standalone-no-errors.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 718014d5d..e74b9ab1e 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 \