Scott Taylor d2b06b9cf9 conflicts: add "snapshot" conflict marker style ... Adds a new "snapshot" conflict marker style which returns a series of snapshots, similar to Git's "diff3" conflict style. The "snapshot" option uses a subset of the conflict hunk headers as the "diff" option (it just doesn't use "%%%%%%%"), meaning that the two options are trivially compatible with each other (i.e. a file materialized with "snapshot" can be parsed with "diff" and vice versa). Example of "snapshot" conflict markers: ``` <<<<<<< Conflict 1 of 1 +++++++ Contents of side #1 fn example(word: String) { println!("word is {word}"); ------- Contents of base fn example(w: String) { println!("word is {w}"); +++++++ Contents of side #2 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 "snapshot" conflict marker style	2024-11-23 08:28:47 -06:00
tests	conflicts: add "snapshot" conflict marker style	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	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00