Merge branch 'sb/submodule-parallel-update' into next
[gitweb.git] / merge-recursive.h
index d415724aea24d0b82f558025a503d5e46df30fc4..735343b4136d998ee3d2ac3672bdd7b5a5ba017e 100644 (file)
@@ -13,7 +13,7 @@ struct merge_options {
                MERGE_RECURSIVE_THEIRS
        } recursive_variant;
        const char *subtree_shift;
-       unsigned buffer_output : 1;
+       unsigned buffer_output; /* 1: output at end, 2: keep buffered */
        unsigned renormalize : 1;
        long xdl_opts;
        int verbosity;