chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Convert "push" to the lib infrastructure
[stgit]
/
t
/
t0002-status.sh
diff --git
a/t/t0002-status.sh
b/t/t0002-status.sh
index d95a83b64e438adda1fe526d01d340d83d142455..ffcad7752f7d56a35de377e0108b8cc79e72c29f 100755
(executable)
--- a/
t/t0002-status.sh
+++ b/
t/t0002-status.sh
@@
-111,7
+111,7
@@
A fie
C foo/bar
EOF
test_expect_success 'Status after conflicting push' '
- conflict
_old
stg push &&
+ conflict stg push &&
stg status > output.txt &&
test_cmp expected.txt output.txt
'