martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-11-11 02:30:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

conflicts: add newline after conflict marker lines

Browse Source 
Merging is currently done with line-level granularity, so it makes
sense to have newlines after the markers. That makes them easier to
edit out when resolving conflicts.
This commit is contained in:
Martin von Zweigbergk 2021-04-24 13:42:42 -07:00
parent f9460e5c52
commit c6f6498cc9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/conflicts.rs
View File

@ -77,13 +77,13 @@ pub fn materialize_conflict(
file.write_all(&contents).unwrap();
}
files::MergeHunk::Conflict { base, left, right } => {
file.write_all(b"<<<<<<<").unwrap();
file.write_all(b"<<<<<<<\n").unwrap();
file.write_all(&left).unwrap();
file.write_all(b"|||||||").unwrap();
file.write_all(b"|||||||\n").unwrap();
file.write_all(&base).unwrap();
file.write_all(b"=======").unwrap();
file.write_all(b"=======\n").unwrap();
file.write_all(&right).unwrap();
file.write_all(b">>>>>>>").unwrap();
file.write_all(b">>>>>>>\n").unwrap();
}
}
}