Cole MillerHighlight merge conflicts and provide for resolving them (#28065)724c9351 year agoHistory
NameLast commit messageLast commit date
..
assistant_configuration
context_picker
ui
active_thread.rs
agent_diff.rs
assistant.rs
assistant_configuration.rs
assistant_model_selector.rs
assistant_panel.rs
buffer_codegen.rs
context.rs
context_picker.rs
context_store.rs
context_strip.rs
history_store.rs
inline_assistant.rs
inline_prompt_editor.rs
message_editor.rs
profile_selector.rs
terminal_codegen.rs
terminal_inline_assistant.rs
thread.rs
thread_history.rs
thread_store.rs
tool_compatibility.rs
tool_use.rs
ui.rs