From 24be677a0669c212bc5dec008968e5af79165248 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Thu, 28 Nov 2024 16:53:38 +0100
Subject: [PATCH] Concatenate arrays in the config when loading multiple files

---
 crates/cli/src/commands/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/cli/src/commands/mod.rs b/crates/cli/src/commands/mod.rs
index 3835ae664..eed27c2f7 100644
--- a/crates/cli/src/commands/mod.rs
+++ b/crates/cli/src/commands/mod.rs
@@ -96,6 +96,6 @@ impl Options {
 
         configs
             .into_iter()
-            .fold(base, |f, path| f.merge(Yaml::file(path)))
+            .fold(base, |f, path| f.admerge(Yaml::file(path)))
     }
 }