![]() Also, ensure we show the correct prompt when files have conflicts. Co-Authored-By: Nathan Sobo <nathan@zed.dev> |
||
---|---|---|
.. | ||
lsp_status.rs | ||
menu.rs | ||
pane.rs | ||
pane_group.rs | ||
settings.rs | ||
sidebar.rs | ||
status_bar.rs | ||
toolbar.rs | ||
workspace.rs |
![]() Also, ensure we show the correct prompt when files have conflicts. Co-Authored-By: Nathan Sobo <nathan@zed.dev> |
||
---|---|---|
.. | ||
lsp_status.rs | ||
menu.rs | ||
pane.rs | ||
pane_group.rs | ||
settings.rs | ||
sidebar.rs | ||
status_bar.rs | ||
toolbar.rs | ||
workspace.rs |