git-debrebase: Merges: Enable with command-line option instead of env var

[dgit.git] / tests / tests / gdr-merge

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 14a823795eaeda4461bc61b88b75fd66f54c430a..d2df2b84dba75ea3178be360ca0c1dea89728ed6 100755 (executable)
--- 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 -----