X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/719309aa54c8fa43bd8700f09b1e293923ed4e0a..1629f59ff44b517fd0e738aca41d5657d083d842:/t/t2101-pull-policy-pull.sh?ds=sidebyside diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh index ce4b5c8..777ccb5 100755 --- a/t/t2101-pull-policy-pull.sh +++ b/t/t2101-pull-policy-pull.sh @@ -43,7 +43,7 @@ test_expect_success \ 'Rewind/rewrite upstream commit and pull it from clone, without --merged' \ ' (cd upstream && echo b >> file2 && stg refresh) && - (cd clone && ! stg pull) + (cd clone && conflict_old stg pull) ' test_expect_success \