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>
This commit is contained in:

committed by
Junio C Hamano

parent
90f867b9a5
commit
501a75a7b3
@ -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 \
|
||||
|
Reference in New Issue
Block a user