Ilya Grigoriev 02a04d0d37 test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests ... Apart from (IMO) looking nicer, this will also sidestep the potential problem that if the file contains actual jj conflict markers (`>>>>>>>` in the beginning of a line, for example), jj would currently have trouble materializing and subsequently parsing conflicts in the file if it actually became conflicted. I'll demo this bug in either this or a subsequent PR. It's the kind of bug that sounds serious in theory but might never cause a problem in practice. After this PR, only `docs/tutorial.md` has a conflict marker that's not indented. There's only one there, so hopefully it won't be too much of a pain to deal with. I also indented other strings in `test_conflicts.rs`. IMO, this looks nice and more consistent with the `insta::assert_snapshot` output. I didn't spend the time to do the same for `test_resolve_command`.		2024-03-22 23:27:25 -07:00
..
runner.rs
test_bad_locking.rs
test_commit_builder.rs
test_commit_concurrent.rs
test_conflicts.rs	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
test_default_revset_graph_iterator.rs
test_diff_summary.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_signing.rs
test_ssh_signing.rs
test_view.rs
test_workspace.rs