~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Repair how patches with empty descriptions are shown
[stgit]
/
t
/
t2500-clean.sh
diff --git
a/t/t2500-clean.sh
b/t/t2500-clean.sh
index
99fd29f
..
7f821f5
100755
(executable)
--- a/
t/t2500-clean.sh
+++ b/
t/t2500-clean.sh
@@
-32,7
+32,7
@@
test_expect_success 'Create a conflict' '
stg new p2 -m p2
echo quux > foo.txt &&
stg refresh &&
stg new p2 -m p2
echo quux > foo.txt &&
stg refresh &&
- conflict
_old
stg push
+ conflict stg push
'
test_expect_success 'Make sure conflicting patches are preserved' '
'
test_expect_success 'Make sure conflicting patches are preserved' '