diff --git a/unpack-trees.h b/unpack-trees.h
index d436d6ced9939beeb4599dc8fddebe0890e55db8..94e567265af9a69a30dd5c578439b6444e50004d 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
typedef int (*merge_fn_t)(struct cache_entry **src,
struct unpack_trees_options *options);
+struct unpack_trees_error_msgs {
+ const char *would_overwrite;
+ const char *not_uptodate_file;
+ const char *not_uptodate_dir;
+ const char *would_lose_untracked;
+ const char *bind_overlap;
+};
+
struct unpack_trees_options {
unsigned int reset:1,
merge:1,
int pos;
struct dir_struct *dir;
merge_fn_t fn;
+ struct unpack_trees_error_msgs msgs;
int head_idx;
int merge_size;