projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send-email: be more lenient and just catch obvious mistakes.
[git.git]
/
git-merge-one-file.sh
diff --git
a/git-merge-one-file.sh
b/git-merge-one-file.sh
index
7dee88a
..
5619409
100755
(executable)
--- a/
git-merge-one-file.sh
+++ b/
git-merge-one-file.sh
@@
-26,7
+26,7
@@
case "${1:-.}${2:-.}${3:-.}" in
fi
if test -f "$4"; then
rm -f -- "$4" &&
fi
if test -f "$4"; then
rm -f -- "$4" &&
- rmdir -p "$(expr "
$4" : '
\(.*\)/')" 2>/dev/null || :
+ rmdir -p "$(expr "
z$4" : 'z
\(.*\)/')" 2>/dev/null || :
fi &&
exec git-update-index --remove -- "$4"
;;
fi &&
exec git-update-index --remove -- "$4"
;;
@@
-82,7
+82,7
@@
case "${1:-.}${2:-.}${3:-.}" in
expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
;;
*)
expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
;;
*)
- echo "Auto-merging $4
.
"
+ echo "Auto-merging $4"
orig=`git-unpack-file $1`
;;
esac
orig=`git-unpack-file $1`
;;
esac
@@
-107,7
+107,7
@@
case "${1:-.}${2:-.}${3:-.}" in
fi
if [ $ret -ne 0 ]; then
fi
if [ $ret -ne 0 ]; then
- echo "ERROR: Merge conflict in $4
.
"
+ echo "ERROR: Merge conflict in $4"
exit 1
fi
exec git-update-index -- "$4"
exit 1
fi
exec git-update-index -- "$4"