Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
packed_ref_cache: keep the `packed-refs` file mmapped if possible
[gitweb.git]
/
git-merge-resolve.sh
diff --git
a/git-merge-resolve.sh
b/git-merge-resolve.sh
index c9da747fcfe504b1fd233c68d91e549def0f3571..343fe7bccd0d64f0caff1ad5d3f981729a8e5fc9 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