X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6026-merge-attr.sh;h=56fc34176859b81137b4d88af90398b9a74a18f7;hb=c4316674c48708ca62876470c615101ab8fee2e0;hp=1732b60ed8be3c8bd8ea39afc62205db4fccc228;hpb=f3ef6b6bbe9bfd3d09130f7e26b87dbe11b93c5b;p=git.git

diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 1732b60ed..56fc34176 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -98,7 +98,9 @@ test_expect_success 'custom merge backend' '
 
 	git reset --hard anchor &&
 	git config --replace-all \
-	merge.driver "custom ./custom-merge %O %A %B 0" &&
+	merge.custom.driver "./custom-merge %O %A %B 0" &&
+	git config --replace-all \
+	merge.custom.name "custom merge driver for testing" &&
 
 	git merge master &&
 
@@ -117,7 +119,9 @@ test_expect_success 'custom merge backend' '
 
 	git reset --hard anchor &&
 	git config --replace-all \
-	merge.driver "custom ./custom-merge %O %A %B 1" &&
+	merge.custom.driver "./custom-merge %O %A %B 1" &&
+	git config --replace-all \
+	merge.custom.name "custom merge driver for testing" &&
 
 	if git merge master
 	then