unpack-trees: oneway_merge to update submodules

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index f8fe04ca5332541213dc059dd02fdf09e0c6cf85..796d0cd66c7750a20613dea77cd75b1b8e7665a4 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -895,7 +895,7 @@ static void export_marks(char *file)
 {
        unsigned int i;
        uint32_t mark;
-       struct object_decoration *deco = idnums.hash;
+       struct decoration_entry *deco = idnums.entries;
        FILE *f;
        int e = 0;