From f7e10b760a689013324b1db873eea7f4d467c6db Mon Sep 17 00:00:00 2001
From: aiongg <aiongtaigi@gmail.com>
Date: Mon, 26 Oct 2026 18:46:26 +0000
Subject: [PATCH] refactor(lightcraft-ui-egui): move merge.rs to
 dialogs/merge.rs

---
 crates/ui-egui/src/dialogs.rs             | 1 +
 crates/ui-egui/src/{ => dialogs}/merge.rs | 0
 crates/ui-egui/src/lib.rs                 | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename crates/ui-egui/src/{ => dialogs}/merge.rs (100%)

diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index da289fbbd..d305965cf 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -8,6 +8,7 @@ use crate::state::Dialog;
 use crate::theme::Tokens;
 
 pub mod import;
+pub mod merge;
 pub mod print_view;
 
 /// Rows the Rename dialog previews.
diff --git a/crates/ui-egui/src/merge.rs b/crates/ui-egui/src/dialogs/merge.rs
similarity index 100%
rename from crates/ui-egui/src/merge.rs
rename to crates/ui-egui/src/dialogs/merge.rs
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 035175171..9c541028b 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -29,7 +29,6 @@ pub mod links;
 pub mod menu_level;
 pub mod menubar;
 pub mod menus;
-pub mod merge;
 mod model_setup;
 pub mod panels;
 pub mod pick;
@@ -65,6 +64,7 @@ use serde_json::Value;
 pub use command_error::CommandError;
 pub use control::{ControlRequest, ControlResponse};
 pub use dialogs::import;
+pub use dialogs::merge;
 pub use dialogs::print_view;
 pub use state::UiState;