huskies: merge 868

2026-04-29 23:28:57 +00:00
parent e02e566648
commit 1d86202abb
15 changed files with 135 additions and 60 deletions
@@ -144,6 +144,7 @@ pub(crate) fn tool_show_epic(args: &Value, _ctx: &AppContext) -> Result<String,
                Stage::Merge { .. } => "merge",
                Stage::Done { .. } => "done",
                Stage::Archived { .. } => "archived",
+                Stage::MergeFailure { .. } => "merge_failure",
                Stage::Frozen { .. } => "frozen",
                Stage::Blocked { .. } => "blocked",
            };