mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-15 16:53:25 +00:00
d2b06b9cf9
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 } ``` |
||
|---|---|---|
| .. | ||
| runner.rs | ||
| test_annotate.rs | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_conflicts.rs | ||
| test_default_revset_graph_iterator.rs | ||
| test_git.rs | ||
| test_git_backend.rs | ||
| test_gpg.rs | ||
| test_id_prefix.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.rs | ||
| test_local_working_copy.rs | ||
| test_local_working_copy_concurrent.rs | ||
| test_local_working_copy_sparse.rs | ||
| test_merge_trees.rs | ||
| test_merged_tree.rs | ||
| test_mut_repo.rs | ||
| test_operations.rs | ||
| test_refs.rs | ||
| test_revset.rs | ||
| test_rewrite.rs | ||
| test_rewrite_duplicate.rs | ||
| test_rewrite_transform.rs | ||
| test_signing.rs | ||
| test_ssh_signing.rs | ||
| test_view.rs | ||
| test_workspace.rs | ||