Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: platform auth providers are working only on 1.6.15 or newer
[gitweb.git]
/
t
/
t4202-log.sh
diff --git
a/t/t4202-log.sh
b/t/t4202-log.sh
index 19a0851e7aee6e6bcc02a72616d5f51846c87442..32cf0bd218ea081e3e1d73400943b30a946f9dd5 100755
(executable)
--- a/
t/t4202-log.sh
+++ b/
t/t4202-log.sh
@@
-346,11
+346,11
@@
test_expect_success 'set up more tangled history' '
'
cat > expect <<\EOF
-* Merge
commit
'reach'
+* Merge
tag
'reach'
|\
| \
| \
-*-. \ Merge
commit 'octopus-a'; commit
'octopus-b'
+*-. \ Merge
tags 'octopus-a' and
'octopus-b'
|\ \ \
* | | | seventh
| | * | octopus-b