projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.17.2
[platform/upstream/git.git]
/
git-merge-octopus.sh
diff --git
a/git-merge-octopus.sh
b/git-merge-octopus.sh
index
6c390d6
..
7d19d37
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