X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;fp=tests%2Ftests%2Fgdr-merge;h=d2df2b84dba75ea3178be360ca0c1dea89728ed6;hp=14a823795eaeda4461bc61b88b75fd66f54c430a;hb=7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5;hpb=91f6d93d44a430cb206457e356f70eda18f714a0

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 14a82379..d2df2b84 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -41,7 +41,7 @@ t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase
 
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
 
 : ----- expect to be able to merge -----