feat(test): clarify --merge option ignored when fixing commits

Author: bryango

git-branchless-test/src/lib.rs

@@ -396,6 +396,13 @@ BUG: Expected resolved_interactive ({resolved_interactive:?}) to match interacti
                 reparent: _, // always implied
             } = move_options;
 
+            if *resolve_merge_conflicts {
+                writeln!(
+                    effects.get_output_stream(),
+                    "Ignoring --merge since --reparent is always implied when fixing commits."
+                )?;
+            }
+
             let force_in_memory = true;
             if *force_on_disk {
                 writeln!(