History

Fix merge conflicts

Conrad Irwin committed 9 months ago

Commit bf0ae281 parent af834787 files · +114 −168Browse files

Showing the changes to crates/buffer_diff/src/buffer_diff.rs (1 of 7 files). Show all

Unified · Split

crates/buffer_diff/src/buffer_diff.rs+1−1
@@ -2,7 +2,7 @@ use futures::channel::oneshot; · 1 unmodified line
22 use git2::{DiffLineType as GitDiffLineType, DiffOptions as GitOptions, Patch as GitPatch};
33 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
44 use language::{
5− Capability, Diff, DiffOptions, File, Language, LanguageName, LanguageRegistry,
5+ Capability, Diff, DiffOptions, Language, LanguageName, LanguageRegistry,
66 language_settings::LanguageSettings, word_diff_ranges,
77 };
88 use rope::Rope;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t