chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: merge: test suite: Check wreckage tidying
[dgit.git]
/
tests
/
tests
/
gdr-merge-conflicts
diff --git
a/tests/tests/gdr-merge-conflicts
b/tests/tests/gdr-merge-conflicts
index 467dc6ad342d27f4dbd6e453e8e6f9bb987fce05..6871fd8a45e9aa7d393d392c8ed8b130c8743493 100755
(executable)
--- 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