Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/unpack-trees.h b/unpack-trees.h
index c4601621cd71ac6e750c90bd3ac4b426d8e12369..191f7442f10683c8043288eece36f39166fedc95 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,7 @@ struct unpack_trees_options {
        int verbose_update;
        int aggressive;
        const char *prefix;
+       struct dir_struct *dir;
        merge_fn_t fn;
 
        int head_idx;