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: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
cli-reference@.md.snap	docs: add FAQ for why to use new-then-amend over edit	2024-03-14 11:32:53 -07:00
runner.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_abandon_command.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_alias.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_branch_command.rs	lib: improve error message for invalid string pattern, suggesting to use one of the known one	2024-03-16 14:22:16 +01:00
test_builtin_aliases.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_cat_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_checkout.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_chmod_command.rs	git_backend: write trees involved in conflict in git commit header	2024-03-10 20:51:05 -07:00
test_commit_command.rs	cli: add --tool=<name> option to diff/merge editing commands	2024-03-04 01:33:43 +09:00
test_commit_template.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_concurrent_operations.rs	op_store: add metadata flag for ops representing working-copy snapshot	2024-02-19 22:44:38 -08:00
test_config_command.rs	cli: colorize output of "config list"	2024-03-06 11:38:57 +09:00
test_debug_command.rs	debug-tree: allow looking up tree by path and id, not just revision	2024-03-14 23:28:59 -07:00
test_describe_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_diff_command.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_diffedit_command.rs	git_backend: write trees involved in conflict in git commit header	2024-03-10 20:51:05 -07:00
test_duplicate_command.rs	cli: make "duplicate none()" exit successfully	2024-03-18 09:32:35 +09:00
test_edit_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_generate_md_cli_help.rs	docs, CLI reference: use include-markdown instead of a symlink	2024-02-12 10:28:09 -08:00
test_git_clone.rs	cli: list new remote branches during git fetch	2024-02-18 17:36:01 +01:00
test_git_colocated.rs	tests: avoid deprecated jj co	2024-03-06 10:19:46 -08:00
test_git_fetch.rs	cli: don't bury GitImportError sources	2024-03-16 12:51:18 +09:00
test_git_import_export.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_git_init.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_git_push.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_git_remotes.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_git_submodule.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_gitignores.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_global_opts.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_immutable_commits.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_init_command.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_interdiff_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_log_command.rs	Make node symbols templatable in the graphs.	2024-03-21 17:41:31 +01:00
test_move_command.rs	description_utils: teach combine_messages() to handle more than two sources	2024-03-13 05:21:05 -07:00
test_new_command.rs	cli: avoid bad hint "Prefix the expression with 'all'..."	2024-03-23 10:05:18 +05:00
test_next_prev_commands.rs	tests: avoid deprecated jj co	2024-03-06 10:19:46 -08:00
test_obslog_command.rs	Make node symbols templatable in the graphs.	2024-03-21 17:41:31 +01:00
test_operations.rs	Make node symbols templatable in the graphs.	2024-03-21 17:41:31 +01:00
test_rebase_command.rs	cli: avoid bad hint "Prefix the expression with 'all'..."	2024-03-23 10:05:18 +05:00
test_repo_change_report.rs	git_backend: write trees involved in conflict in git commit header	2024-03-10 20:51:05 -07:00
test_resolve_command.rs	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
test_restore_command.rs	git_backend: write trees involved in conflict in git commit header	2024-03-10 20:51:05 -07:00
test_revset_output.rs	lib: improve error message for invalid string pattern, suggesting to use one of the known one	2024-03-16 14:22:16 +01:00
test_root.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_shell_completion.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_show_command.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_sparse_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_split_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_squash_command.rs	squash: accept multiple --from revisions	2024-03-13 05:21:05 -07:00
test_status_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_tag_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_templater.rs	templater: migrate global functions to table-based lookup	2024-03-16 10:28:19 +09:00
test_tree_level_conflicts.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_undo.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_unsquash_command.rs	description_utils: teach combine_messages() to handle more than two sources	2024-03-13 05:21:05 -07:00
test_untrack_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_util_command.rs	op_store: add metadata flag for ops representing working-copy snapshot	2024-02-19 22:44:38 -08:00
test_working_copy.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_workspaces.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00