Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint

diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index d51d29251eb2cf5adeba1d4f94ff2ce100421560..a01430c24bdb8c0e35147b71d6f9e898405b1c85 100644 (file)
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -12,7 +12,7 @@ static int dry_run = 0, quiet = 0;
 static char *string = NULL;
 static char *file = NULL;
 static int ambiguous;
-static struct string_list list;
+static struct string_list list = STRING_LIST_INIT_NODUP;
 
 static struct {
        int called;