projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix HTTP request result processing after slot reuse
[git.git]
/
t
/
t1200-tutorial.sh
diff --git
a/t/t1200-tutorial.sh
b/t/t1200-tutorial.sh
old mode 100644
(file)
new mode 100755
(executable)
index
d7562e9
..
8ff5dd9
--- a/
t/t1200-tutorial.sh
+++ b/
t/t1200-tutorial.sh
@@
-118,8
+118,8
@@
cat > show-branch.expect << EOF
* [master] Merged "mybranch" changes.
! [mybranch] Some work.
--
* [master] Merged "mybranch" changes.
! [mybranch] Some work.
--
-
+
[master] Merged "mybranch" changes.
-
+
+ [mybranch] Some work.
+
-
[master] Merged "mybranch" changes.
+
*
+ [mybranch] Some work.
EOF
git show-branch --topo-order master mybranch > show-branch.output
EOF
git show-branch --topo-order master mybranch > show-branch.output
@@
-142,7
+142,7
@@
cat > show-branch2.expect << EOF
! [master] Merged "mybranch" changes.
* [mybranch] Merged "mybranch" changes.
--
! [master] Merged "mybranch" changes.
* [mybranch] Merged "mybranch" changes.
--
-
++
[master] Merged "mybranch" changes.
+
--
[master] Merged "mybranch" changes.
EOF
git show-branch --topo-order master mybranch > show-branch2.output
EOF
git show-branch --topo-order master mybranch > show-branch2.output