t: replace pulls with merges
commit501a75a7b308ed9631cd4802d891e6b56c06821a
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 31 Oct 2013 09:25:33 +0000 (31 03:25 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Oct 2013 18:12:26 +0000 (31 11:12 -0700)
tree4a31a6825838654afca7a3e42ab828a97a4f7de5
parent90f867b9a5088a2ea6f5844ae28b617821e77b28
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>
t/annotate-tests.sh
t/t4200-rerere.sh
t/t9114-git-svn-dcommit-merge.sh
t/t9500-gitweb-standalone-no-errors.sh