From 6debb7527b0e2f791256a216394503899b0488ee Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 18 Jun 2022 00:20:54 +0000 Subject: merge-ort: store messages in a list, not in a single strbuf To prepare for using the `merge-ort` machinery in server operations, we cannot simply produce a free-form string that combines a variable-length list of messages. Instead, we need to list them one by one. The natural fit for this is a `string_list`. We will subsequently add even more information in the `util` attribute of the string list items. Based-on-a-patch-by: Elijah Newren Signed-off-by: Johannes Schindelin Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-ort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-ort.h') diff --git a/merge-ort.h b/merge-ort.h index ddcc39d727..f9c536ed8c 100644 --- a/merge-ort.h +++ b/merge-ort.h @@ -28,7 +28,7 @@ struct merge_result { /* * Special messages and conflict notices for various paths * - * This is a map of pathnames to strbufs. It contains various + * 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. */ -- cgit v1.2.3