~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add install-html target to makefile
[stgit]
/
t
/
t2101-pull-policy-pull.sh
diff --git
a/t/t2101-pull-policy-pull.sh
b/t/t2101-pull-policy-pull.sh
index
ce4b5c8
..
777ccb5
100755
(executable)
--- a/
t/t2101-pull-policy-pull.sh
+++ b/
t/t2101-pull-policy-pull.sh
@@
-43,7
+43,7
@@
test_expect_success \
'Rewind/rewrite upstream commit and pull it from clone, without --merged' \
'
(cd upstream && echo b >> file2 && stg refresh) &&
- (cd clone &&
!
stg pull)
+ (cd clone &&
conflict_old
stg pull)
'
test_expect_success \