chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'dgit/dgit/experimental' into HEAD
[dgit.git]
/
tests
/
tests
/
overwrite-splitbrains
diff --git
a/tests/tests/overwrite-splitbrains
b/tests/tests/overwrite-splitbrains
index 0ef03f65369b216df446b46a64eadf467ed17ed0..06d1a987159dded6c3df000c1e1f197ff7164679 100755
(executable)
--- a/
tests/tests/overwrite-splitbrains
+++ b/
tests/tests/overwrite-splitbrains
@@
-14,7
+14,7
@@
t-dgit fetch
t-refs-same-start
t-ref-head
t-refs-same-start
t-ref-head
-t-expect-fail '
check failed (
maybe --overwrite is needed' \
+t-expect-fail 'maybe --overwrite is needed' \
t-dgit --quilt=gbp --dgit-view-save=split.p push
t-refs-same-start
t-dgit --quilt=gbp --dgit-view-save=split.p push
t-refs-same-start