~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable'
[stgit]
/
t
/
t1400-patch-history.sh
diff --git
a/t/t1400-patch-history.sh
b/t/t1400-patch-history.sh
index
a693e75
..
13cd1e3
100755
(executable)
--- a/
t/t1400-patch-history.sh
+++ b/
t/t1400-patch-history.sh
@@
-82,7
+82,7
@@
test_expect_success \
echo bar > test && stg refresh &&
stg pop &&
echo foo > test && stg refresh &&
-
!
stg push &&
+
conflict_old
stg push &&
stg log --full | grep -q -e "^push(c) "
'