dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-04 20:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Bug fix: fix panic in merge conflict diff -U0

Browse Source
This commit is contained in:
Dan Davison 2021-12-05 08:55:01 -05:00
parent cfe900edbe
commit 975f4e867f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/handlers/hunk.rs
View File

@ -154,6 +154,11 @@ fn new_line_state(new_line: &str, prev_state: &State) -> Option<State> {
| HunkPlus(Combined(Prefix(prefix), in_merge_conflict), _) => {
Combined(Number(prefix.len()), in_merge_conflict.clone())
}
HunkMinus(Combined(Number(n), in_merge_conflict), _)
| HunkZero(Combined(Number(n), in_merge_conflict))
| HunkPlus(Combined(Number(n), in_merge_conflict), _) => {
Combined(Number(*n), in_merge_conflict.clone())
}
_ => delta_unreachable(&format!(
"Unexpected state in new_line_state: {:?}",
prev_state