X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=d2df2b84dba75ea3178be360ca0c1dea89728ed6;hb=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;hp=60146913f93e6d84d26e4d3590145c29584ecd39;hpb=9fe91f98a08e948bf3e282cd17f7c2637669a216;p=dgit.git

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 60146913..d2df2b84 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -8,8 +8,6 @@ t-dependencies NO-DGIT GDR
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
-: 'do a simple test'
-
 cd $p
 
 t-gdr-prep-new-upstream 2.1
@@ -18,12 +16,16 @@ git tag v2.1 upstream
 t-some-changes before
 t-git-debrebase quick
 
+: ----- prepare LH branch -----
+
 git checkout -b other
 t-some-changes other '' -other
 
 echo 'other-conflict' >>debian/zorkmid
 git commit -m 'other-conflict' debian/zorkmid
 
+: ----- prepare RH branch -----
+
 git checkout master
 t-some-changes us-1 '' -us
 t-git-debrebase new-upstream 2.1
@@ -32,12 +34,16 @@ echo 'us-conflict' >>debian/zorkmid
 git commit -m 'us-conflict' debian/zorkmid
 t-git-debrebase quick
 
+: ----- introduce a vanilla merge -----
+
 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 -----
 
 t-git-debrebase
 t-gdr-good laundered