~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Populate the cached config options with the defaults
[stgit]
/
t
/
t1205-push-subdir.sh
diff --git
a/t/t1205-push-subdir.sh
b/t/t1205-push-subdir.sh
index
f852762
..
2d5918b
100755
(executable)
--- a/
t/t1205-push-subdir.sh
+++ b/
t/t1205-push-subdir.sh
@@
-47,7
+47,7
@@
test_expect_success 'Conflicting push from subdir' '
[ "$(echo $(cat x.txt))" = "x0" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0" ] &&
cd foo &&
[ "$(echo $(cat x.txt))" = "x0" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0" ] &&
cd foo &&
- conflict
_old
stg push p2 &&
+ conflict stg push p2 &&
cd .. &&
[ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
'
cd .. &&
[ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
'