Commit Diff


commit - abc6a33f6abdb9b7560fe12f4d32a2f7471ed81c
commit + 5d731149d3ea6345b1d5f305211e91eee9f038cd
blob - bd1d37e42b80fa95d9d086f1bc3cd05d17c4406b
blob + 651456af4f82ad11248ecc83188c87ddc546029f
--- lib/diff3.c
+++ lib/diff3.c
@@ -267,6 +267,8 @@ got_merge_diff3(int outfd, const char *p1, const char 
 	struct wklhead temp_files;
 	struct diff3_state *d3s;
 	int i;
+
+	SLIST_INIT(&temp_files);
 
 	d3s = calloc(1, sizeof(*d3s));
 	if (d3s == NULL)