X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft5515-fetch-merge-logic.sh;h=31c108161781165d5e32f08b95089086627eda64;hb=d8b3a2bf189a9e7fea76454157b77fa71c9abc05;hp=0b600bb429b69df02d971913e4b658bf7e313277;hpb=ed287ab7fa71528e8de288988d1662eebae64002;p=git.git

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 0b600bb42..31c108161 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -84,8 +84,7 @@ test_expect_success setup '
 		git config branch.br-$remote-merge.merge refs/heads/three &&
 		git config branch.br-$remote-octopus.remote $remote &&
 		git config branch.br-$remote-octopus.merge refs/heads/one &&
-		git config --add branch.br-$remote-octopus.merge two &&
-		git config --add branch.br-$remote-octopus.merge remotes/rem/three
+		git config --add branch.br-$remote-octopus.merge two
 	done
 '
 
@@ -149,7 +148,7 @@ do
 		} >"$actual" &&
 		if test -f "$expect"
 		then
-			diff -u "$expect" "$actual" &&
+			git diff -u "$expect" "$actual" &&
 			rm -f "$actual"
 		else
 			# this is to help developing new tests.