mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-05 19:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge_tools: assume that conflict is 3-way

Browse source 
We check that the conflict to run the merge tool on is at most 3-way
already, and we don't store 1-way conflicts, so we should be able to
assume that it's exactly a 3-way conflict.
This commit is contained in:
Martin von Zweigbergk 2023-06-25 06:03:07 -07:00 committed by Martin von Zweigbergk
parent b8221d4e21
commit 75f3537893
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/merge_tools.rs
View file

@ -187,9 +187,9 @@ pub fn run_mergetool(
vec![] vec![]
}; };
let files: HashMap<&str, _> = maplit::hashmap! { let files: HashMap<&str, _> = maplit::hashmap! {
"base" => content.removes.pop().unwrap_or_default(), "base" => content.removes.pop().unwrap(),
"right" => content.adds.pop().unwrap_or_default(), "right" => content.adds.pop().unwrap(),
"left" => content.adds.pop().unwrap_or_default(), "left" => content.adds.pop().unwrap(),
"output" => initial_output_content.clone(), "output" => initial_output_content.clone(),
}; };