OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
rev-list docs: clarify --topo-order description
[git-core/git.git]
/
git-merge-one-file.sh
diff --git
a/git-merge-one-file.sh
b/git-merge-one-file.sh
index
7aeb969
..
f612cb8
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"