diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2022-06-18 00:20:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 23:10:06 (GMT) |
| commit | 2715e8a931ce1ad3a7bcffbdc6c0e556ae87d158 (patch) | |
| tree | f65b58e77dc6185f71097dc073cae17f90e1b08c /merge-ort.h | |
| parent | 6debb7527b0e2f791256a216394503899b0488ee (diff) | |
| download | git-2715e8a931ce1ad3a7bcffbdc6c0e556ae87d158.zip git-2715e8a931ce1ad3a7bcffbdc6c0e556ae87d158.tar.gz git-2715e8a931ce1ad3a7bcffbdc6c0e556ae87d158.tar.bz2 | |
merge-ort: make `path_messages` a strmap to a string_list
This allows us once again to get away with less data copying.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.h')
| -rw-r--r-- | merge-ort.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.h b/merge-ort.h index f9c536e..c4909bc 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 a string_list. It contains various * warning/conflict/notice messages (possibly multiple per path) * that callers may want to use. */ |