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
..
common
cli-reference@.md.snap
runner.rs
test_abandon_command.rs
test_alias.rs
test_branch_command.rs
test_builtin_aliases.rs
test_cat_command.rs
test_checkout.rs
test_chmod_command.rs
test_commit_command.rs
test_commit_template.rs
test_concurrent_operations.rs
test_config_command.rs
test_debug_command.rs
test_describe_command.rs
test_diff_command.rs
test_diffedit_command.rs
test_duplicate_command.rs
test_edit_command.rs
test_generate_md_cli_help.rs
test_git_clone.rs
test_git_colocated.rs
test_git_fetch.rs
test_git_import_export.rs
test_git_init.rs
test_git_push.rs
test_git_remotes.rs
test_git_submodule.rs
test_gitignores.rs
test_global_opts.rs
test_immutable_commits.rs
test_init_command.rs
test_interdiff_command.rs
test_log_command.rs
test_move_command.rs
test_new_command.rs
test_next_prev_commands.rs
test_obslog_command.rs
test_operations.rs
test_rebase_command.rs
test_repo_change_report.rs
test_resolve_command.rs
test_restore_command.rs
test_revset_output.rs
test_root.rs
test_shell_completion.rs
test_show_command.rs
test_sparse_command.rs
test_split_command.rs
test_squash_command.rs
test_status_command.rs
test_tag_command.rs
test_templater.rs
test_tree_level_conflicts.rs
test_undo.rs
test_unsquash_command.rs
test_untrack_command.rs
test_util_command.rs
test_working_copy.rs
test_workspaces.rs