diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-18 22:13:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-18 22:13:54 -0700 |
| commit | 275fb96ae65b0886d9e6e93a421453eb6d13cb9f (patch) | |
| tree | f982b8defd5c9f3b887bcbe97edc0c63742df16d /builtin-read-tree.c | |
| parent | 69c18d887253a8fd44df232a604ba3dac3d371a5 (diff) | |
| parent | 2bda77e080dd8d47ca0b87c78e9061fbaa37455a (diff) | |
| download | git-275fb96ae65b0886d9e6e93a421453eb6d13cb9f.tar.gz | |
Merge early parts of branch 'ff/c99'
Diffstat (limited to 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 04506da892..9a2099d730 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -31,8 +31,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; |