t: replace pulls with merges
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 31 Oct 2013 09:25:33 +0000 (03:25 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Oct 2013 18:12:26 +0000 (11:12 -0700)
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>
No differences found