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:
parent
e635798fe0
commit
29e2e13e6d
1 changed files with 2 additions and 2 deletions
|
@ -932,9 +932,9 @@ impl GitPanel {
|
||||||
&format!(
|
&format!(
|
||||||
"Are you sure you want to restore {}?",
|
"Are you sure you want to restore {}?",
|
||||||
entry
|
entry
|
||||||
.worktree_path
|
.repo_path
|
||||||
.file_name()
|
.file_name()
|
||||||
.unwrap_or(entry.worktree_path.as_os_str())
|
.unwrap_or(entry.repo_path.as_os_str())
|
||||||
.to_string_lossy()
|
.to_string_lossy()
|
||||||
),
|
),
|
||||||
None,
|
None,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue