X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-read-tree.c;fp=builtin-read-tree.c;h=fdd6706869cc1045a7d0aed7a702a3102408a2c2;hb=91df4330d35f1f1670dd04af0a14f1ca84a72b2b;hp=bb50fbd274e2d7e73fc3c6f86a73bd22f636400e;hpb=372bb52dd567d39c3e64919e100ae9bd8af603ca;p=git.git

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index bb50fbd2..fdd67068 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -30,8 +30,7 @@ static int merge_size = 0;
 
 static struct object_list *trees = NULL;
 
-static struct cache_entry df_conflict_entry = {
-};
+static struct cache_entry df_conflict_entry;
 
 struct tree_entry_list {
 	struct tree_entry_list *next;