Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
connect: teach client to recognize v1 server response
[gitweb.git]
/
contrib
/
examples
/
git-resolve.sh
diff --git
a/contrib/examples/git-resolve.sh
b/contrib/examples/git-resolve.sh
index 70fdc27b724f28793c6a4bff713957a22689b78b..3099dc851ac26a9280e7e6d1a73638c05d01cc17 100755
(executable)
--- a/
contrib/examples/git-resolve.sh
+++ b/
contrib/examples/git-resolve.sh
@@
-41,7
+41,7
@@
fi
case "$common" in
"$merge")
- echo "Already up
-to-
date. Yeeah!"
+ echo "Already up
to
date. Yeeah!"
dropheads
exit 0
;;