Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/http-fetch.c b/http-fetch.c
index 557b40322f22b77a81140ff8f29b2b2be0505581..09baedc18ae320a2f09fa61d9065bedb69c02a41 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -198,7 +198,7 @@ static void start_object_request(struct object_request *obj_req)
                SHA1_Init(&obj_req->c);
                if (prev_posn>0) {
                        prev_posn = 0;
-                       lseek(obj_req->local, SEEK_SET, 0);
+                       lseek(obj_req->local, 0, SEEK_SET);
                        ftruncate(obj_req->local, 0);
                }
        }