From 29e2e13e6ded1edf636774ebdf7facd2f6ac59d4 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 26 Mar 2025 19:00:08 -0400
Subject: [PATCH] Fix broken merge (#27551)

This PR fixes main after a semantic merge conflict with
https://github.com/zed-industries/zed/pull/27391.

Release Notes:

- N/A
---
 crates/git_ui/src/git_panel.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index c9d66bdc31..3296df0ac8 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -932,9 +932,9 @@ impl GitPanel {
                     &format!(
                         "Are you sure you want to restore {}?",
                         entry
-                            .worktree_path
+                            .repo_path
                             .file_name()
-                            .unwrap_or(entry.worktree_path.as_os_str())
+                            .unwrap_or(entry.repo_path.as_os_str())
                             .to_string_lossy()
                     ),
                     None,