Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
i18n: remote: allow translations to reorder message
[gitweb.git]
/
git-merge-octopus.sh
diff --git
a/git-merge-octopus.sh
b/git-merge-octopus.sh
index d79fc84029293818e7baf14c414eaa3ca3989ac6..308eafd1d38422ce5e9d4c8d90050a28795479f9 100755
(executable)
--- a/
git-merge-octopus.sh
+++ b/
git-merge-octopus.sh
@@
-6,7
+6,6
@@
#
. git-sh-setup
-. git-sh-i18n
LF='
'