~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'gustav/proposed'
[stgit]
/
t
/
t3000-dirty-merge.sh
diff --git
a/t/t3000-dirty-merge.sh
b/t/t3000-dirty-merge.sh
index
419d86e
..
d8c16fa
100755
(executable)
--- a/
t/t3000-dirty-merge.sh
+++ b/
t/t3000-dirty-merge.sh
@@
-7,7
+7,7
@@
test_description='Try a push that requires merging a file that is dirty'
test_expect_success 'Initialize StGit stack with two patches' '
stg init &&
touch a &&
-
git
add a &&
+
stg
add a &&
git commit -m a &&
echo 1 > a &&
git commit -a -m p1 &&