diff options
Diffstat (limited to '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 |