huskies: merge 868

2026-04-29 23:28:57 +00:00
parent e02e566648
commit 1d86202abb
15 changed files with 135 additions and 60 deletions
@@ -18,6 +18,7 @@ pub fn stage_display_name(stage: &str) -> &'static str {
        Some(Stage::Merge { .. }) => "Merge",
        Some(Stage::Done { .. }) => "Done",
        Some(Stage::Archived { .. }) => "Archived",
+        Some(Stage::MergeFailure { .. }) => "MergeFailure",
        Some(Stage::Frozen { .. }) => "Frozen",
        None => "Unknown",
    }