just playing with tangled
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

undo yuya's suggestion

+8
+8
cli/src/merge_tools/external.rs
··· 269 269 exit_status, 270 270 })); 271 271 } 272 + tracing::info!(%exit_status, "Tool exited successfully{}:", exit_status_implies_conflict.then_some(", informed jj to expect conflicts").unwrap_or_default()); 272 273 273 274 let output_file_contents: Vec<u8> = 274 275 std::fs::read(variables.get("output").unwrap()).map_err(ExternalToolError::Io)?; ··· 277 278 } 278 279 279 280 let new_file_ids = if editor.merge_tool_edits_conflict_markers || exit_status_implies_conflict { 281 + tracing::info!( 282 + "jj is reparsing output for conflicts{}.", 283 + editor 284 + .merge_tool_edits_conflict_markers 285 + .then_some(" due to `merge-tool-edits-conflict-markers` config") 286 + .unwrap_or_default() 287 + ); 280 288 conflicts::update_from_content( 281 289 file_merge, 282 290 store,