diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 18:58:16 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:11:09 +0100 |
commit | 11f20779c3a2d56ebdf9430737b7960bd628b16d (patch) | |
tree | 8b7ca668dc2ca0d66236f07e27b5a9682dec785d /tests/tests | |
parent | 2e2f354d54d8af330c5a4a5ceab9d8c9604e5c0d (diff) |
git-debrebase: merge: test gdr-merge-conflicts: Test late wreckage
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-x | tests/tests/gdr-merge-conflicts | 4 |
1 files changed, 3 insertions, 1 deletions
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 |