OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ik/userdiff-html-h-element-fix' into maint
[git-core/git.git]
/
git-merge-octopus.sh
diff --git
a/git-merge-octopus.sh
b/git-merge-octopus.sh
index
bcf0d92
..
6c390d6
100755
(executable)
--- a/
git-merge-octopus.sh
+++ b/
git-merge-octopus.sh
@@
-100,7
+100,7
@@
do
if test $? -ne 0
then
gettextln "Simple merge did not work, trying automatic merge."
if test $? -ne 0
then
gettextln "Simple merge did not work, trying automatic merge."
- git
-
merge-index -o git-merge-one-file -a ||
+ git
merge-index -o git-merge-one-file -a ||
OCTOPUS_FAILURE=1
next=$(git write-tree 2>/dev/null)
fi
OCTOPUS_FAILURE=1
next=$(git write-tree 2>/dev/null)
fi