chiark / gitweb /
git-debrebase: merge: test gdr-merge-conflicts: Test late wreckage
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:58:16 +0000 (18:58 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:09 +0000 (20:11 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge-conflicts

index e556db4..ab57a1e 100755 (executable)
@@ -88,9 +88,11 @@ t-merge-conflicted-stripping-conflict-markers other docs/README
 
 : ----- expect failure -----
 
+wreckage-before
+
 t-expect-fail F:'docs/README' \
 t-git-debrebase
 
-# xxx want to check wrecknotes appear
+wreckage-after
 
 t-ok