Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
workspace: Rename "Discard" to "Discard Edits" in file conflict prompt (#55870)
Agani Daniel .Sf7d9ae33b5ce
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rsindex 837afb6183d..e8e70de7966 100644--- a/crates/workspace/src/pane.rs+++ b/crates/workspace/src/pane.rs@@ -2344,7 +2344,7 @@ impl Pane {PromptLevel::Warning,CONFLICT_MESSAGE,None,- &["Overwrite", "Discard", "Cancel"],+ &["Overwrite", "Discard Edits", "Cancel"],cx,)})?;diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rsindex 9e89a46ac6e..cdfbcb78a34 100644--- a/crates/workspace/src/workspace.rs+++ b/crates/workspace/src/workspace.rs@@ -12410,7 +12410,7 @@ mod tests {assert!(cx.has_pending_prompt());// Cancel saving item 3.- cx.simulate_prompt_answer("Discard");+ cx.simulate_prompt_answer("Discard Edits");cx.executor().run_until_parked();// Item 3 is reloaded. There's a prompt to save item 4.