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=25b2ee0a22f20fe23ce6865c0eee3381bc5ca050;hb=965fdfed6e03d38b273baf1fa282a3d2ef828484;hpb=0323a891b385296fd346dd1ea794c5c2ee8229a0

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 25b2ee0a..666672fa 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -54,18 +54,13 @@ 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
 
 t-some-changes after
 t-git-debrebase
-
-# 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-gdr-good laundered
 
 t-ok