~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a branch --cleanup option
[stgit]
/
t
/
t1203-push-conflict.sh
diff --git
a/t/t1203-push-conflict.sh
b/t/t1203-push-conflict.sh
index
57119ab
..
b759298
100755
(executable)
--- a/
t/t1203-push-conflict.sh
+++ b/
t/t1203-push-conflict.sh
@@
-38,7
+38,7
@@
test_expect_success \
test_expect_success \
'Push the first patch with conflict' \
'
test_expect_success \
'Push the first patch with conflict' \
'
-
!
stg push foo
+
conflict
stg push foo
'
test_expect_success \
'
test_expect_success \
@@
-56,14
+56,14
@@
test_expect_success \
test_expect_success \
'Check that pop will fail while there are unmerged conflicts' \
'
test_expect_success \
'Check that pop will fail while there are unmerged conflicts' \
'
-
!
stg pop
+
command_error
stg pop
'
test_expect_success \
'Resolve the conflict' \
'
echo resolved > test &&
'
test_expect_success \
'Resolve the conflict' \
'
echo resolved > test &&
-
git ad
d test &&
+
stg resolve
d test &&
stg refresh
'
stg refresh
'