diff options
| -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 |