mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 15:43:12 +00:00
b84be06c08
One advantage of our conflict marker style (compared to the usual 3-way markers) is that they provide the user with the diff between the base and one side so the user doesn't have to do that in their head (which is how I use 3-way markers anyway). However, since we currently always use the "first" side for the diff, that diff can be larger than if we had picked the other side, which makes the marker style worse than the usual 3-way markers. This has bothered me many times and it's about time we fix it. |
||
|---|---|---|
| .. | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_conflicts.rs | ||
| test_diff_summary.rs | ||
| test_git.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.rs | ||
| test_merge_trees.rs | ||
| test_mut_repo.rs | ||
| test_operations.rs | ||
| test_refs.rs | ||
| test_revset.rs | ||
| test_revset_graph_iterator.rs | ||
| test_rewrite.rs | ||
| test_view.rs | ||
| test_working_copy.rs | ||
| test_working_copy_concurrent.rs | ||
| test_working_copy_sparse.rs | ||
| test_workspace.rs | ||