diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 1732b60ed8be3c8bd8ea39afc62205db4fccc228..56fc34176859b81137b4d88af90398b9a74a18f7 100755 (executable)
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
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 &&
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