diff --git a/unpack-trees.h b/unpack-trees.h
index 191f7442f10683c8043288eece36f39166fedc95..fee7da43822b63e5b1f24444e5c51c43d3ff5760 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
int verbose_update;
int aggressive;
const char *prefix;
+ int pos;
struct dir_struct *dir;
merge_fn_t fn;