Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Makefile: add missing dependency for command-list.h
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index d863cf88676ef321aad85d395f964efe5673a805..248093e407c7744b1e3e9a5bd5780375a1c6c07f 100644
(file)
--- 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;
};
/*