diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 18:19:56 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:11:09 +0100 |
| commit | 22e1d5872f69e3622bb84e6ea3b8e0b9df06d5d4 (patch) | |
| tree | 9be21da36710fe18637a62c9bd64e95e1fb043a6 | |
| parent | bc8a67b8d44d166e125c946960cdfe567e2325dc (diff) | |
git-debrebase: merge: test suite: Check wreckage tidying
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 467dc6a..6871fd8 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -75,6 +75,8 @@ git commit -m 'other-upstream-conflict' docs/README t-git-debrebase quick +if git for-each-ref refs/debrebase-wreckage | egrep .; then fail wreck; fi + : ----- make the merge ----- git checkout master |