diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index d863cf8867..248093e407 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -29,6 +29,7 @@ struct merge_options { struct hashmap current_file_dir_set; struct string_list df_conflict_file_set; struct unpack_trees_options unpack_opts; + struct index_state orig_index; }; /* |