projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[git.git]
/
t
/
t1200-tutorial.sh
diff --git
a/t/t1200-tutorial.sh
b/t/t1200-tutorial.sh
index
8ff5dd9
..
1002413
100755
(executable)
--- a/
t/t1200-tutorial.sh
+++ b/
t/t1200-tutorial.sh
@@
-95,13
+95,13
@@
test_expect_success 'git branch' 'cmp branch.expect branch.output'
git checkout mybranch
echo "Work, work, work" >>hello
git checkout mybranch
echo "Work, work, work" >>hello
-git commit -m 'Some work.' hello
+git commit -m 'Some work.'
-i
hello
git checkout master
echo "Play, play, play" >>hello
echo "Lots of fun" >>example
git checkout master
echo "Play, play, play" >>hello
echo "Lots of fun" >>example
-git commit -m 'Some fun.' hello example
+git commit -m 'Some fun.'
-i
hello example
test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
@@
-112,7
+112,7
@@
Play, play, play
Work, work, work
EOF
Work, work, work
EOF
-git commit -m 'Merged "mybranch" changes.' hello
+git commit -m 'Merged "mybranch" changes.'
-i
hello
cat > show-branch.expect << EOF
* [master] Merged "mybranch" changes.
cat > show-branch.expect << EOF
* [master] Merged "mybranch" changes.
@@
-128,7
+128,7
@@
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output
git checkout mybranch
cat > resolve.expect << EOF
git checkout mybranch
cat > resolve.expect << EOF
-Updating from VARIABLE to VARIABLE
.
+Updating from VARIABLE to VARIABLE
example | 1 +
hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
example | 1 +
hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)