From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 12:32:28 +0000 (+0100)
Subject: git-debrebase: merge: test suite: Do a bit more testing
X-Git-Tag: archive/debian/6.7~122
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=965fdfed6e03d38b273baf1fa282a3d2ef828484

git-debrebase: merge: test suite: Do a bit more testing

We can now call t-gdr-good laundered, because it works.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index baffedfc..666672fa 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -54,12 +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
-
-# t-gdr-good laundered
-# xxx ^ this does not work
+t-gdr-good laundered
 
 t-ok