X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=25b2ee0a22f20fe23ce6865c0eee3381bc5ca050;hp=7a6ffdb63281a0345c1f967a58d2c7e50c003847;hb=0323a891b385296fd346dd1ea794c5c2ee8229a0;hpb=770df553c36474e58926dfe833d97b375cd9c272

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 7a6ffdb6..25b2ee0a 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -48,14 +48,15 @@ t-git-debrebase quick
 
 git merge other
 
-t-some-changes after
-# xxx ^ commenting out this line produces an internal error
-
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
+t-git-debrebase
+t-git-debrebase scrap
+
+t-some-changes after
 t-git-debrebase
 
 # xxx want to check that we DTRT if we start out unstitched -