Get rid of the dependency on RCS' merge program

diff --git a/ssh-fetch.c b/ssh-fetch.c
index 0b89df6ddae5cfdfa4259379fc801f5e28f7c403..b006c5c9802d96bc504188e10a9698a1f943477c 100644 (file)
--- a/ssh-fetch.c
+++ b/ssh-fetch.c
@@ -67,7 +67,7 @@ int fetch(unsigned char *sha1)
        signed char remote;
        struct object_list *temp;
 
-       if (memcmp(sha1, in_transit->item->sha1, 20)) {
+       if (hashcmp(sha1, in_transit->item->sha1)) {
                /* we must have already fetched it to clean the queue */
                return has_sha1_file(sha1) ? 0 : -1;
        }