@@ -4,14 +4,9 @@ use helix_core::{
44 movement::{self, Direction},
55 object, pos_at_coords,
66 regex::{self, Regex},
7−<<<<<<< HEAD
87 register::{self, Register, Registers},
9− search, selection, Change, ChangeSet, Position, Range, Rope, RopeSlice, Selection, SmallVec,
10− Tendril, Transaction,
11−=======
12− register, search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeSlice,
13− Selection, SmallVec, Tendril, Transaction,
14−>>>>>>> 856fd95 (trying out line ending helper functions in commands.rs)
8+ search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeSlice, Selection,
9+ SmallVec, Tendril, Transaction,
1510};
1611
1712use helix_view::{
@@ -348,7 +343,7 @@ where
348343 KeyEvent {
349344 code: KeyCode::Enter,
350345 ..
351− } => '\n',
346+ } => '\n',
352347 KeyEvent {
353348 code: KeyCode::Char(ch),
354349 ..
@@ -2285,15 +2280,10 @@ fn paste_impl(
22852280 .unwrap(),
22862281 );
22872282
2288−<<<<<<< HEAD
22892283 // if any of values ends \n it's linewise paste
2290− let linewise = values.iter().any(|value| value.ends_with('\n'));
2291−=======
2292− // if any of values ends \n it's linewise paste
2293− let linewise = values
2294− .iter()
2295− .any(|value| value.ends_with(doc.line_ending()));
2296−>>>>>>> 856fd95 (trying out line ending helper functions in commands.rs)
2284+ let linewise = values
2285+ .iter()
2286+ .any(|value| value.ends_with(doc.line_ending()));
22972287
22982288 let mut values = values.iter().cloned().map(Tendril::from).chain(repeat);
22992289