mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-25 16:09:56 +00:00
4c46398b1c
`update_from_content()` already writes file content for each term of an unresolved merge, so it seems consistent for it to also write the file content for resolved merges. I think this should simplify further refactoring for tree-level conflicts and for preserving the executable bit. |
||
|---|---|---|
| .. | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_conflicts.rs | ||
| test_default_revset_graph_iterator.rs | ||
| test_diff_summary.rs | ||
| test_git.rs | ||
| test_id_prefix.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.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_view.rs | ||
| test_working_copy.rs | ||
| test_working_copy_concurrent.rs | ||
| test_working_copy_sparse.rs | ||
| test_workspace.rs | ||