diff --git a/unpack-trees.h b/unpack-trees.h
index 5517faafad6ca3f327c81ab6e8e5f2701ff0ad14..a2df544d040adc21f7d854ad50c53e61cf74c9ae 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
int trivial_merges_only;
int verbose_update;
int aggressive;
+ int skip_unmerged;
+ int gently;
const char *prefix;
int pos;
struct dir_struct *dir;
int merge_size;
struct cache_entry *df_conflict_entry;
+ void *unpack_data;
};
extern int unpack_trees(unsigned n, struct tree_desc *t,