$OpenBSD: patch-base_src_client_Merge_c,v 1.2 2003/05/28 13:27:48 todd Exp $
--- base/src/client/Merge.c.orig	Sat Mar 29 16:15:24 2003
+++ base/src/client/Merge.c	Wed May 28 08:14:56 2003
@@ -554,7 +554,7 @@ mergetuple_create()
   
   static unsigned mergeCount = 0;
 
-  MergeTuple *tup = (MergeTuple *) GC_MALLOC(sizeof(MergeTuple));
+  MergeTuple *tup = (MergeTuple *) calloc(1, sizeof(MergeTuple));
 
   tup->ndx = mergeCount++;
   
@@ -719,9 +719,9 @@ build_merge_plan(PendingChange *pc, Repo
 	 && rbtree_isEmpty(mergeEnts))
   {
     MergeTuple *tup = mergetuple_create();
-    tup->common = 0;
-    tup->ws = 0;
-    tup->merge = 0;
+    tup->common = NULL;
+    tup->ws = NULL;
+    tup->merge = NULL;
 
     if (!rbtree_isEmpty(commonEnts)) {
       rbnode *ceNode = commonEnts->root;
