X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=666672faa82ac01fbf8ee07f37a26f78dfdb25e5;hp=7a6ffdb63281a0345c1f967a58d2c7e50c003847;hb=965fdfed6e03d38b273baf1fa282a3d2ef828484;hpb=404b824d7a46eee9fe76398fda6a44a7e9cf3681

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 7a6ffdb6..666672fa 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -48,23 +48,19 @@ 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-gdr-good laundered
+t-git-debrebase
+t-gdr-good laundered
+t-git-debrebase scrap
 
-# xxx want to check that we DTRT if we start out unstitched -
-# xxx should consider our ffq-prev as a parent
-# xxx or should we ?  it's not a parent of the merge is it ?
-# xxx => user should prefer to make merges when stitched ?
-# xxx think about this later
-
-# t-gdr-good laundered
-# xxx ^ this does not work
+t-some-changes after
+t-git-debrebase
+t-gdr-good laundered
 
 t-ok