ZIm/crates/git_ui/src
Cole Miller 9041f734fd
git: Save buffer when resolving a conflict from the project diff (#30762)
Closes #30555

Release Notes:

- Changed the project diff to autosave the targeted buffer after
resolving a merge conflict.
2025-05-19 17:32:31 +00:00
..
askpass_modal.rs chore: Bump Rust edition to 2024 (#27800) 2025-03-31 20:55:27 +02:00
blame_ui.rs editor: Move blame popover from hover_tooltip to editor prepaint (#29320) 2025-04-25 01:52:24 +05:30
branch_picker.rs git: Don't filter local upstreams from branch picker (#30557) 2025-05-19 13:41:58 +00:00
commit_message_prompt.txt git_ui: Try to prompt the model out of including the diff output (#26281) 2025-03-07 15:05:35 +00:00
commit_modal.rs Improve handling of remote-tracking branches in the picker (#29744) 2025-05-01 21:24:26 -04:00
commit_tooltip.rs editor: Move blame popover from hover_tooltip to editor prepaint (#29320) 2025-04-25 01:52:24 +05:30
commit_view.rs Add searchable global tab switcher (#28047) 2025-04-28 09:21:27 +00:00
conflict_view.rs git: Save buffer when resolving a conflict from the project diff (#30762) 2025-05-19 17:32:31 +00:00
git_panel.rs Reduce allocations (#30693) 2025-05-14 18:29:28 +02:00
git_panel_settings.rs Git tweaks (#28791) 2025-04-28 23:42:23 -06:00
git_ui.rs git_ui: Fix resetting of onboarding banner (#30051) 2025-05-06 23:20:37 +00:00
onboarding.rs chore: Bump Rust edition to 2024 (#27800) 2025-03-31 20:55:27 +02:00
picker_prompt.rs chore: Bump Rust version to 1.86 (#28021) 2025-04-03 23:32:50 +02:00
project_diff.rs git: Save buffer when resolving a conflict from the project diff (#30762) 2025-05-19 17:32:31 +00:00
remote_output.rs Fix message on push (#26588) 2025-03-12 20:18:28 +00:00
repository_selector.rs chore: Bump Rust edition to 2024 (#27800) 2025-03-31 20:55:27 +02:00