projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96ce6d2
)
Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward...
author
Junio C Hamano
<junkio@cox.net>
Fri, 10 Mar 2006 06:51:21 +0000
(22:51 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 10 Mar 2006 06:51:21 +0000
(22:51 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t1200-tutorial.sh
patch
|
blob
|
history
diff --git
a/t/t1200-tutorial.sh
b/t/t1200-tutorial.sh
index c8a85f92dd271be54461ef3fce7f6e6cd8b53e87..10024133e3e69af0d14200d23c00d1ba7d1dbf74 100755
(executable)
--- a/
t/t1200-tutorial.sh
+++ b/
t/t1200-tutorial.sh
@@
-128,7
+128,7
@@
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output
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(-)