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/gdr-merge-conflicts | |
| 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/gdr-merge-conflicts')
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 2 |
1 files changed, 1 insertions, 1 deletions
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 |