Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
remote-hg: get rid of unused exception checks
[gitweb.git]
/
t
/
t1200-tutorial.sh
diff --git
a/t/t1200-tutorial.sh
b/t/t1200-tutorial.sh
index 9356beaf4be45c32d10209c5063b7a9c5aa06d42..397ccb690908dad2d45bab3d249f9c62f2dc91d1 100755
(executable)
--- a/
t/t1200-tutorial.sh
+++ b/
t/t1200-tutorial.sh
@@
-154,8
+154,8
@@
test_expect_success 'git show-branch' '
cat > resolve.expect << EOF
Updating VARIABLE..VARIABLE
FASTFORWARD (no commit created; -m option ignored)
- example |
1 +
- hello |
1 +
+ example | 1 +
+ hello | 1 +
2 files changed, 2 insertions(+)
EOF