projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Anal retentive 'const unsigned char *sha1'
[git.git]
/
git-resolve-script
diff --git
a/git-resolve-script
b/git-resolve-script
index
cd6e25a
..
da79a97
100644
(file)
--- a/
git-resolve-script
+++ b/
git-resolve-script
@@
-43,7
+43,7
@@
if [ "$common" == "$head" ]; then
fi
echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1
fi
echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1
-merge_msg="Merge
of
$merge_repo"
+merge_msg="Merge $merge_repo"
result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"
result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"
@@
-52,7
+52,6
@@
if [ $? -ne 0 ]; then
echo "Automatic merge failed, fix up by hand"
exit 1
fi
echo "Automatic merge failed, fix up by hand"
exit 1
fi
- merge_msg="Automatic merge of $merge_repo"
result_tree=$(git-write-tree) || exit 1
fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
result_tree=$(git-write-tree) || exit 1
fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)