From 7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 20:44:29 +0100 Subject: git-debrebase: Merges: Enable with command-line option instead of env var Signed-off-by: Ian Jackson --- tests/tests/gdr-merge | 2 +- tests/tests/gdr-merge-conflicts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/tests') diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index 14a8237..d2df2b8 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 ----- diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 71be280..660415d 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -8,7 +8,7 @@ t-dependencies NO-DGIT GDR t-tstunt-parsechangelog t-setup-import gdr-convert-gbp-noarchive -export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1 +t_gdr_xopts+=' --experimental-merge-resolution' wreckage-before () { junkref=refs/debrebase/wreckage/junk -- cgit v1.2.3