builtin-merge: avoid run_command_v_opt() for recursive and subtree

diff --git a/ppc/sha1.c b/ppc/sha1.c
index 0820398b004dd8af93a25e7fa26be60cf4dda410..738e36c1e81def4822ccc2a66bc2761402a07f26 100644 (file)
--- a/ppc/sha1.c
+++ b/ppc/sha1.c
@@ -50,7 +50,7 @@ int SHA1_Update(SHA_CTX *c, const void *ptr, unsigned long n)
                p += nb;
        }
        return 0;
-}      
+}
 
 int SHA1_Final(unsigned char *hash, SHA_CTX *c)
 {