~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Test the new stg delete --spill flag
[stgit]
/
t
/
t0002-status.sh
diff --git
a/t/t0002-status.sh
b/t/t0002-status.sh
index
86ff419
..
ac92aa8
100755
(executable)
--- a/
t/t0002-status.sh
+++ b/
t/t0002-status.sh
@@
-114,7
+114,7
@@
A fie
C foo/bar
EOF
test_expect_success 'Status after conflicting push' '
-
!
stg push &&
+
conflict_old
stg push &&
stg status > output.txt &&
test_cmp expected.txt output.txt
'