From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:58:16 +0000 (+0100)
Subject: git-debrebase: merge: test gdr-merge-conflicts: Test late wreckage
X-Git-Tag: archive/debian/6.7~80
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=11f20779c3a2d56ebdf9430737b7960bd628b16d;hp=2e2f354d54d8af330c5a4a5ceab9d8c9604e5c0d;p=dgit.git

git-debrebase: merge: test gdr-merge-conflicts: Test late wreckage

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

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index e556db45..ab57a1e3 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -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