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.18.4
[platform/upstream/git.git]
/
git-merge-resolve.sh
diff --git
a/git-merge-resolve.sh
b/git-merge-resolve.sh
index
c9da747
..
343fe7b
100755
(executable)
--- a/
git-merge-resolve.sh
+++ b/
git-merge-resolve.sh
@@
-45,7
+45,7
@@
then
exit 0
else
echo "Simple merge failed, trying Automatic merge."
- if git
-
merge-index -o git-merge-one-file -a
+ if git
merge-index -o git-merge-one-file -a
then
exit 0
else