rebase: extract merge code to new source file

diff --git a/string-list.c b/string-list.c
index 7b616ae825ae08138e89ef47fb6d39b1fa54f6cb..9b023a25841cb7a9c1faecc30c484eba0e16d6af 100644 (file)
--- a/string-list.c
+++ b/string-list.c
@@ -148,7 +148,7 @@ void print_string_list(const struct string_list *p, const char *text)
                printf("%s:%p\n", p->items[i].string, p->items[i].util);
 }
 
-struct string_list_item *string_list_append(const char *string, struct string_list *list)
+struct string_list_item *string_list_append(struct string_list *list, const char *string)
 {
        ALLOC_GROW(list->items, list->nr + 1, list->alloc);
        list->items[list->nr].string =