projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] git-tar-tree: do only basic tests in t/t5000-git-tar-tree.sh
[git.git]
/
git-merge-one-file-script
diff --git
a/git-merge-one-file-script
b/git-merge-one-file-script
index
3fb43cc
..
3e128c6
100755
(executable)
--- a/
git-merge-one-file-script
+++ b/
git-merge-one-file-script
@@
-52,9
+52,9
@@
case "${1:-.}${2:-.}${3:-.}" in
#
"$1$2$3")
echo "Auto-merging $4."
#
"$1$2$3")
echo "Auto-merging $4."
- orig=
$(git-unpack-file $1)
- src1=
$(git-unpack-file $2)
- src2=
$(git-unpack-file $3)
+ orig=
`git-unpack-file $1`
+ src1=
`git-unpack-file $2`
+ src2=
`git-unpack-file $3`
merge "$src2" "$orig" "$src1"
ret=$?
if [ "$6" != "$7" ]; then
merge "$src2" "$orig" "$src1"
ret=$?
if [ "$6" != "$7" ]; then
@@
-64,7
+64,7
@@
case "${1:-.}${2:-.}${3:-.}" in
echo "ERROR: Leaving conflict merge in $src2."
exit 1
fi
echo "ERROR: Leaving conflict merge in $src2."
exit 1
fi
- sha1=
$(git-write-blob "$src2")
|| {
+ sha1=
`git-write-blob "$src2"`
|| {
echo "ERROR: Leaving conflict merge in $src2."
}
exec git-update-cache --add --cacheinfo "$6" $sha1 "$4" ;;
echo "ERROR: Leaving conflict merge in $src2."
}
exec git-update-cache --add --cacheinfo "$6" $sha1 "$4" ;;