huskies: merge 868

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