merge-recursive: avoid losing output and leaking memory holding that output

[thirdparty/git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index 9e040608fec98e09ac8fa01abc58ed724125735a..933d6e76427d217c30d51299b665981a127c992b 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -38,7 +38,8 @@ struct merge_options {
        /* console output related options */
        int verbosity;
        unsigned buffer_output; /* 1: output at end, 2: keep buffered */
-       struct strbuf obuf;     /* output buffer */
+       struct strbuf obuf;     /* output buffer; if buffer_output == 2, caller
+                                * must handle and call strbuf_release */
 
        /* miscellaneous control options */
        const char *subtree_shift;