git-debrebase: merge: test suite: Test both with and without `after'

[dgit.git] / tests / tests / gdr-merge

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 7a6ffdb63281a0345c1f967a58d2c7e50c003847..25b2ee0a22f20fe23ce6865c0eee3381bc5ca050 100755 (executable)
--- 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 -