Hello,

this patch fixes git-merge-one-file-script's automerge.

Signed-off-by: Petr Baudis <[EMAIL PROTECTED]>

git-merge-one-file-script: 7ebf5dac4c69043cd2ff89bf7ee552152802f8d1
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -43,7 +43,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        orig=$(unpack-file $1)
        src1=$(unpack-file $2)
        src2=$(unpack-file $3)
-       merge "$src2" "$orig" "$src1" || echo Leaving conflict merge in $src2 
&& exit 1
+       merge "$src2" "$orig" "$src1" || (echo Leaving conflict merge in $src2 
&& exit 1)
        cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
        ;;
 


-- 
                                Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to