Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
read_loose_refs(): eliminate ref_cache argument
[gitweb.git]
/
git-merge-one-file.sh
diff --git
a/git-merge-one-file.sh
b/git-merge-one-file.sh
index 7aeb96952f668baef2fd18383806e13a20415f19..f612cb847aca981e16cb6006fa08d870497c6263 100755
(executable)
--- a/
git-merge-one-file.sh
+++ b/
git-merge-one-file.sh
@@
-117,7
+117,7
@@
case "${1:-.}${2:-.}${3:-.}" in
# If we do not have enough common material, it is not
# worth trying two-file merge using common subsections.
- expr
"$sz0" \< "$sz1"
\* 2 >/dev/null || : >$orig
+ expr
$sz0 \< $sz1
\* 2 >/dev/null || : >$orig
;;
*)
echo "Auto-merging $4"