sending errors to stdout under $PAGER

diff --git a/unpack-trees.h b/unpack-trees.h
index 5517faafad6ca3f327c81ab6e8e5f2701ff0ad14..197a0044aa71fc9ca310b36b279b8382487a40a7 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -25,6 +25,7 @@ struct unpack_trees_options {
        int merge_size;
 
        struct cache_entry *df_conflict_entry;
+       void *unpack_data;
 };
 
 extern int unpack_trees(unsigned n, struct tree_desc *t,