t6010-merge-base.sh: Depict the octopus test graph

diff --git a/unpack-trees.h b/unpack-trees.h
index 94e567265af9a69a30dd5c578439b6444e50004d..1e0e2325f150e943dd22b16c1392c136570732bc 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -26,6 +26,8 @@ struct unpack_trees_options {
                     verbose_update:1,
                     aggressive:1,
                     skip_unmerged:1,
+                    initial_checkout:1,
+                    diff_index_cached:1,
                     gently:1;
        const char *prefix;
        int pos;