diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 20:44:29 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 21:14:39 +0100 |
commit | 7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5 (patch) | |
tree | 30b12593ca68f6e45a6caaccdaad80881e03207f /tests/tests | |
parent | 91f6d93d44a430cb206457e356f70eda18f714a0 (diff) |
git-debrebase: Merges: Enable with command-line option instead of env var
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-x | tests/tests/gdr-merge | 2 | ||||
-rwxr-xr-x | tests/tests/gdr-merge-conflicts | 2 |
2 files changed, 2 insertions, 2 deletions
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 |