Merge branch 'en/fetch-negotiation-default-fix'

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

diff --git a/merge-ort.h b/merge-ort.h
index c011864ffeb115b43a26940a8f0b24d33c8e8182..fe599b8786891c74cbc5e911689f4a4d319152cd 100644 (file)
--- a/merge-ort.h
+++ b/merge-ort.h
@@ -5,6 +5,7 @@
 
 struct commit;
 struct tree;
+struct strmap;
 
 struct merge_result {
        /*
@@ -23,6 +24,15 @@ struct merge_result {
         */
        struct tree *tree;
 
+       /*
+        * Special messages and conflict notices for various paths
+        *
+        * This is a map of pathnames to strbufs.  It contains various
+        * warning/conflict/notice messages (possibly multiple per path)
+        * that callers may want to use.
+        */
+       struct strmap *path_messages;
+
        /*
         * Additional metadata used by merge_switch_to_result() or future calls
         * to merge_incore_*().  Includes data needed to update the index (if