From 501a75a7b308ed9631cd4802d891e6b56c06821a Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 31 Oct 2013 03:25:33 -0600
Subject: 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/t4200-rerere.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 't/t4200-rerere.sh')

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 7f6666fcd..cf19eb78a 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -172,7 +172,7 @@ test_expect_success 'first postimage wins' '
 	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
 	git commit -q -a -m third &&
 
-	test_must_fail git pull . first &&
+	test_must_fail git merge first &&
 	# rerere kicked in
 	! grep "^=======\$" a1 &&
 	test_cmp expect a1
-- 
cgit v1.2.1