Scott Taylor e5cb9f94f6 conflicts: add "ui.conflict-marker-style" config ... Adds a new "ui.conflict-marker-style" config option. The "diff" option is the default jj-style conflict markers with a snapshot and a series of diffs to apply to the snapshot. New conflict marker style options will be added in later commits. The majority of the changes in this commit are from passing the config option down to the code that materializes the conflicts. Example of "diff" conflict markers: ``` <<<<<<< Conflict 1 of 1 +++++++ Contents of side #1 fn example(word: String) { println!("word is {word}"); %%%%%%% Changes from base to side #2 -fn example(w: String) { +fn example(w: &str) { println!("word is {w}"); >>>>>>> Conflict 1 of 1 ends } ```		2024-11-23 08:28:47 -06:00
..
benches	style: add semicolon at the end of expressions used as statements	2024-10-04 22:29:13 +02:00
gen-protos	cargo: inherit lints configuration from workspace	2024-10-04 22:29:13 +02:00
proc-macros	style: remove useless uses of .iter()	2024-10-04 22:29:13 +02:00
src	conflicts: add "ui.conflict-marker-style" config	2024-11-23 08:28:47 -06:00
tests	conflicts: add "ui.conflict-marker-style" config	2024-11-23 08:28:47 -06:00
testutils	transaction: propagate errors from commit()	2024-11-13 23:05:24 -08:00
Cargo.toml	config: extract ConfigNamePathBuf to jj-lib	2024-11-23 10:20:27 +09:00
LICENSE