diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-10-31 10:25:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 19:12:26 +0100 |
| commit | 501a75a7b308ed9631cd4802d891e6b56c06821a (patch) | |
| tree | 4a31a6825838654afca7a3e42ab828a97a4f7de5 /t/t9500-gitweb-standalone-no-errors.sh | |
| parent | merge: simplify ff-only option (diff) | |
| download | git-501a75a7b308ed9631cd4802d891e6b56c06821a.tar.xz git-501a75a7b308ed9631cd4802d891e6b56c06821a.zip | |
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-x | t/t9500-gitweb-standalone-no-errors.sh | 2 |
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 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 \ |