diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index bae98845c..231e5cbd7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -365,7 +365,7 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o, * below the corresponding directory. */ const char *last_file = NULL; - int last_len; + int last_len = 0; struct stage_data *last_e; int i; |