Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
trace.c: export trace_setup_key
[gitweb.git]
/
git-merge-octopus.sh
diff --git
a/git-merge-octopus.sh
b/git-merge-octopus.sh
index 6c390d6c229d7ef8cca8ae01d33b42b57e29c3b3..7d19d379512b52168d7c604002e872fc3eef9fd7 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