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
This commit is contained in:
Cole Miller 2025-03-26 19:00:08 -04:00 committed by GitHub
parent e635798fe0
commit 29e2e13e6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -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,