merge_tools: simplify file conflicts before attempting to resolve

cli/src/merge_tools/mod.rs

@@ -298,14 +298,16 @@ impl MergeEditor {
                 String::from_utf8_lossy(summary_bytes.as_slice()).to_string(),
             )
         })?;
+        let simplified_file_merge = file_merge.clone().simplify();
         // We only support conflicts with 2 sides (3-way conflicts)
-        if file_merge.num_sides() > 2 {
+        if simplified_file_merge.num_sides() > 2 {
             return Err(ConflictResolveError::ConflictTooComplicated {
                 path: repo_path.to_owned(),
-                sides: file_merge.num_sides(),
+                sides: simplified_file_merge.num_sides(),
             });
         };
-        let content = extract_as_single_hunk(&file_merge, tree.store(), repo_path).block_on();
+        let content =
+            extract_as_single_hunk(&simplified_file_merge, tree.store(), repo_path).block_on();
 
         match &self.tool {
             MergeTool::Builtin => {

cli/tests/test_resolve_command.rs

@@ -494,7 +494,7 @@ fn test_too_many_parents() {
 
 #[test]
 fn test_simplify_conflict_sides() {
-    let test_env = TestEnvironment::default();
+    let mut test_env = TestEnvironment::default();
     test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
     let repo_path = test_env.env_root().join("repo");
 
@@ -555,13 +555,71 @@ fn test_simplify_conflict_sides() {
     >>>>>>> Conflict 1 of 1 ends
     "###);
 
-    // TODO: The conflict should be simplified before being resolved.
+    // Conflict should be simplified before being handled by external merge tool.
-    let error = test_env.jj_cmd_failure(&repo_path, &["resolve", "fileB"]);
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileA", "base", "base\n");
-    insta::assert_snapshot!(error, @r###"
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileA", "left", "1\n");
-    Hint: Using default editor ':builtin'; run `jj config set --user ui.merge-editor :builtin` to disable this message.
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileA", "right", "2\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileB", "base", "base\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileB", "left", "1\n");
+    check_resolve_produces_input_file(&mut test_env, &repo_path, "fileB", "right", "2\n");
+
+    // Check that simplified conflicts are still parsed as conflicts after editing
+    // when `merge-tool-edits-conflict-markers=true`.
+    let editor_script = test_env.set_up_fake_editor();
+    std::fs::write(
+        editor_script,
+        indoc! {"
+            write
+            <<<<<<< Conflict 1 of 1
+            %%%%%%% Changes from base to side #1
+            -base_edited
+            +1_edited
+            +++++++ Contents of side #2
+            2_edited
+            >>>>>>> Conflict 1 of 1 ends
+        "},
+    )
+    .unwrap();
+    let (stdout, stderr) = test_env.jj_cmd_ok(
+        &repo_path,
+        &[
+            "resolve",
+            "--config-toml",
+            "merge-tools.fake-editor.merge-tool-edits-conflict-markers=true",
+            "fileB",
+        ],
+    );
+    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stderr, @r###"
     Resolving conflicts in: fileB
-    Error: Failed to resolve conflicts
+    New conflicts appeared in these commits:
-    Caused by: The conflict at "fileB" has 4 sides. At most 2 sides are supported.
+      nkmrtpmo 4b14662a conflict | (conflict) conflict
+    To resolve the conflicts, start by updating to it:
+      jj new nkmrtpmomlro
+    Then use `jj resolve`, or edit the conflict markers in the file directly.
+    Once the conflicts are resolved, you may want inspect the result with `jj diff`.
+    Then run `jj squash` to move the resolution into the conflicted commit.
+    Working copy now at: nkmrtpmo 4b14662a conflict | (conflict) conflict
+    Parent commit      : kmkuslsw 18c1fb00 conflictA | (conflict) (empty) conflictA
+    Parent commit      : lylxulpl d11c92eb conflictB | (conflict) (empty) conflictB
+    Added 0 files, modified 1 files, removed 0 files
+    There are unresolved conflicts at these paths:
+    fileA    2-sided conflict
+    fileB    2-sided conflict
+    "###);
+    insta::assert_snapshot!(std::fs::read_to_string(repo_path.join("fileB")).unwrap(), @r###"
+    <<<<<<< Conflict 1 of 1
+    %%%%%%% Changes from base to side #1
+    -base_edited
+    +1_edited
+    +++++++ Contents of side #2
+    2_edited
+    >>>>>>> Conflict 1 of 1 ends
+    "###);
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
+    @r###"
+    fileA    2-sided conflict
+    fileB    2-sided conflict
     "###);
 }