~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert "pop" to the lib infrastructure
[stgit]
/
t
/
t0002-status.sh
diff --git
a/t/t0002-status.sh
b/t/t0002-status.sh
index
ac92aa8
..
d95a83b
100755
(executable)
--- a/
t/t0002-status.sh
+++ b/
t/t0002-status.sh
@@
-107,9
+107,6
@@
test_expect_success 'Make a conflicting patch' '
'
cat > expected.txt <<EOF
'
cat > expected.txt <<EOF
-? foo/bar.ancestor
-? foo/bar.current
-? foo/bar.patched
A fie
C foo/bar
EOF
A fie
C foo/bar
EOF