diff options
| author | Petr Baudis <pasky@ucw.cz> | 2005-05-11 02:00:49 +0200 |
|---|---|---|
| committer | Petr Baudis <xpasky@machine.sinus.cz> | 2005-05-11 02:00:49 +0200 |
| commit | f1a7eb36b017c62d9a007b6b8660bdeec3f94f97 (patch) | |
| tree | 9d9c288e2db202401ffba37a1b921f4244a79b2b /git-merge-one-file-script | |
| parent | 883550481f885ab2865ab71819167230d21d4c14 (diff) | |
| parent | b790abb874890926e4cfda552bfa89d1d4ff972b (diff) | |
| download | git-f1a7eb36b017c62d9a007b6b8660bdeec3f94f97.tar.gz | |
Merge with http://members.cox.net/junkio/git-jc.git
Diffstat (limited to 'git-merge-one-file-script')
| -rwxr-xr-x | git-merge-one-file-script | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script index 3fb43ccb09..3e128c665d 100755 --- 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." - 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 @@ -64,7 +64,7 @@ case "${1:-.}${2:-.}${3:-.}" in 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" ;; |