From 11f20779c3a2d56ebdf9430737b7960bd628b16d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 18:58:16 +0100 Subject: git-debrebase: merge: test gdr-merge-conflicts: Test late wreckage Signed-off-by: Ian Jackson --- tests/tests/gdr-merge-conflicts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index e556db4..ab57a1e 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 -- cgit v1.2.3