Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
treewide: correct several "up-to-date" to "up to date"
[gitweb.git]
/
git-merge-octopus.sh
diff --git
a/git-merge-octopus.sh
b/git-merge-octopus.sh
index bcf0d92ec223bf9e1f0995c5acef6376d1299502..5b2162c89d7b1bb110e08d273172256abb0829a4 100755
(executable)
--- a/
git-merge-octopus.sh
+++ b/
git-merge-octopus.sh
@@
-74,7
+74,7
@@
do
case "$LF$common$LF" in
*"$LF$SHA1$LF"*)
- eval_gettextln "Already up
-to-
date with \$pretty_name"
+ eval_gettextln "Already up
to
date with \$pretty_name"
continue
;;
esac