git-debrebase: merge: Introduce merge_attempt_cmd global

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

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index e556db458d1afa18058ec3fa1fbf27ecee8acde6..ab57a1e35b73dbb17ef87d5875afa2e4dc4b3379 100755 (executable)
--- 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