X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Foverwrite-splitbrains;h=815c207bf999ae19e29c5cf85b2509a75790c13d;hb=5c9c4ec9b1b1764bcf5060030662c5bfe5aec71d;hp=0ef03f65369b216df446b46a64eadf467ed17ed0;hpb=6dbc82e06ae1e6840dfa2ef2cc6b496561e6f333;p=dgit.git diff --git a/tests/tests/overwrite-splitbrains b/tests/tests/overwrite-splitbrains index 0ef03f65..815c207b 100755 --- a/tests/tests/overwrite-splitbrains +++ b/tests/tests/overwrite-splitbrains @@ -5,7 +5,6 @@ set -e t-tstunt-parsechangelog t-gbp-example-prep-no-ff -t-newtag t-dgit --quilt=gbp --dgit-view-save=split.b build-source @@ -14,7 +13,7 @@ t-dgit fetch 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