Handle more trivial cases
This commit is contained in:
parent
cfeab3939f
commit
2083675c07
1 changed files with 8 additions and 0 deletions
|
|
@ -12,6 +12,14 @@ pub fn reconcile(original: &str, left: &str, right: &str) -> String {
|
|||
return left.to_string();
|
||||
}
|
||||
|
||||
if original == left {
|
||||
return right.to_string();
|
||||
}
|
||||
|
||||
if original == right {
|
||||
return left.to_string();
|
||||
}
|
||||
|
||||
let left_operations = EditedText::from_strings(original, left);
|
||||
let right_operations = EditedText::from_strings(original, right);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue