The test was expecting a failure but StGIT actually does a three-way merge
that succeeds.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
'Try to push those patches without merge detection' \
"(cd bar && stg push --all
)
'Try to push those patches without merge detection' \
"(cd bar && stg push --all
)
test_expect_success \
'Pull those patches applied upstream' \
test_expect_success \
'Pull those patches applied upstream' \
- "(cd bar && stg push --all --merged
+ "(cd bar && stg push --undo && stg push --all --merged