From 501a75a7b308ed9631cd4802d891e6b56c06821a Mon Sep 17 00:00:00 2001 From: Felipe Contreras 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 Signed-off-by: Junio C Hamano --- t/t9114-git-svn-dcommit-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t9114-git-svn-dcommit-merge.sh') diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index f524d2f383..d33d714006 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' ' echo friend > README && cat tmp >> README && git commit -a -m "friend" && - git pull . merge + git merge merge ' test_debug 'gitk --all & sleep 1' -- cgit v1.2.1