Martin von Zweigbergk 4e8fbaa210 git: allow conflicts in "HEAD@git" ... Git's HEAD ref is similar to other refs and can logically have conflicts just like the other refs in `git_refs`. As with the other refs, it can happen if you run concurrent commands importing two different updates from Git. So let's treat `git_head` the same as `git_refs` by making it an `Option<RefTarget>`.		2023-01-30 09:05:03 -08:00
..
test_bad_locking.rs	op_heads_store: remove LockedOpHeads	2023-01-20 15:18:08 -08:00
test_commit_builder.rs	repo: add MutableRepo::rewrite_commit() returning CommitBuilder	2022-12-26 23:30:52 -08:00
test_commit_concurrent.rs	cleanup: update more "checkout" to "working-copy commit" and similar	2023-01-25 11:02:59 -08:00
test_conflicts.rs	Rename FileConflictData to ConflictHunk, use it in files.rs.	2022-12-03 15:12:40 -08:00
test_diff_summary.rs	matchers: simplify FilesMatcher::new() to take slice of paths	2022-12-30 14:15:27 +09:00
test_git.rs	git: allow conflicts in "HEAD@git"	2023-01-30 09:05:03 -08:00
test_index.rs	repo: add MutableRepo::new_commit() returning CommitBuilder	2022-12-26 23:30:52 -08:00
test_init.rs	cleanup: update more "checkout" to "working-copy commit" and similar	2023-01-25 11:02:59 -08:00
test_load_repo.rs	op_heads_store: remove LockedOpHeads	2023-01-20 15:18:08 -08:00
test_merge_trees.rs	repo: add MutableRepo::rewrite_commit() returning CommitBuilder	2022-12-26 23:30:52 -08:00
test_mut_repo.rs	cleanup: update more "checkout" to "working-copy commit" and similar	2023-01-25 11:02:59 -08:00
test_operations.rs	simple_op_heads_store: rename storage directory	2023-01-25 09:22:38 -08:00
test_refs.rs
test_revset.rs	git: allow conflicts in "HEAD@git"	2023-01-30 09:05:03 -08:00
test_revset_graph_iterator.rs
test_rewrite.rs	repo: add MutableRepo::rewrite_commit() returning CommitBuilder	2022-12-26 23:30:52 -08:00
test_view.rs	git: allow conflicts in "HEAD@git"	2023-01-30 09:05:03 -08:00
test_working_copy.rs	testutils: create a function for writing a random commit to MutableRepo	2022-12-26 23:30:52 -08:00
test_working_copy_concurrent.rs	cleanup: let new Clippy move variables into format strings	2022-12-14 21:30:58 -08:00
test_working_copy_sparse.rs
test_workspace.rs	workspace: do not look up ancestor paths by Workspace::load()	2023-01-10 23:31:26 +09:00