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
..
custom-backend	backend: make write methods async	2024-09-04 18:34:11 -07:00
custom-command	cli: pass &Ui to parse fileset/revset/template functions	2024-09-20 23:01:12 +09:00
custom-commit-templater	revset: reorganize expression resolution/evaluation methods	2024-11-08 10:34:02 +09:00
custom-global-flag	cli: extract CommandError and helper functions to new module	2024-03-03 01:11:46 +09:00
custom-operation-templater	templater: pass diagnostics receiver around	2024-09-23 07:07:07 +09:00
custom-working-copy	conflicts: add "ui.conflict-marker-style" config	2024-11-23 08:28:47 -06:00