feat: show base-relative changes in conflict panes

tests/unit/editor.rs

@@ -122,7 +122,10 @@ fn resolver_shares_native_excerpt_search_motions_and_explicit_writable_side() {
     }
     let draft = before.join("\n");
     let alternative = after.join("\n");
-    let mut resolver = resolver_editor(&draft, &[(&draft, false), (&alternative, false)]);
+    let mut resolver = resolver_editor(
+        &draft,
+        &[(&draft, false), (&alternative, false), (&draft, true)],
+    );
     let mut ordinary = editor();
     historical_diff(&mut ordinary, &directory.0, before, after);
     for editor in [&mut resolver, &mut ordinary] {
@@ -161,10 +164,6 @@ fn resolver_shares_native_excerpt_search_motions_and_explicit_writable_side() {
                 .is_some()
         );
     }
-    assert_eq!(
-        resolver.diff().unwrap().display_rows,
-        ordinary.diff().unwrap().display_rows
-    );
     assert!(resolver.diff_editing());
     assert!(resolver.diff().unwrap().side_editable(Focus::Before));
     assert!(!resolver.diff().unwrap().side_editable(Focus::After));
@@ -397,7 +396,6 @@ fn resolver_history_selects_every_side_and_base_without_moving_draft_or_viewport
     editor.set_diff_viewport(diff.comparison_id.unwrap(), diff.file, 8, 2, 4);
     let cursor = editor.cursor();
     let buffer = editor.buffer_id();
-    let id = editor.resolver_diff().unwrap().comparison_id;
     assert!(editor.file_picker().is_none());
     editor.execute("word_wrap.toggle");
     assert!(editor.word_wrap());
@@ -419,7 +417,6 @@ fn resolver_history_selects_every_side_and_base_without_moving_draft_or_viewport
     assert_eq!(editor.cursor(), cursor);
     assert_eq!(editor.buffer_id(), buffer);
     let diff = editor.resolver_diff().unwrap();
-    assert_eq!(diff.comparison_id, id);
     assert_eq!((diff.top, diff.left_before, diff.left_after), (8, 2, 4));
     assert!(editor.word_wrap());
     editor.handle(Input::Char('\t'));