Ilya Grigoriev d6c1b0bc9c jj resolve: option to parse conflict markers + tests ... If this new option is not specified, we start with empty output file and trust the merge tool did a complete merge no matter what the file contains. Includes tests.		2022-12-03 15:12:40 -08:00
..
common	Test basic jj resolve functionality	2022-12-03 15:12:40 -08:00
test_alias.rs
test_branch_command.rs
test_checkout.rs
test_commit_command.rs
test_concurrent_operations.rs
test_describe_command.rs
test_diff_command.rs
test_edit_command.rs
test_git_clone.rs
test_git_colocated.rs	cli: hint about how to recover from failed export of branches	2022-11-28 19:54:31 -08:00
test_git_export.rs	cli: hint about how to recover from failed export of branches	2022-11-28 19:54:31 -08:00
test_git_push.rs
test_git_remotes.rs
test_gitignores.rs
test_global_opts.rs	cli: add --no-pager	2022-11-30 06:14:39 +08:00
test_init_command.rs
test_interdiff_command.rs
test_log_command.rs	cli: require revision arguments to be non-empty strings	2022-11-28 09:17:43 -10:00
test_move_command.rs
test_new_command.rs
test_obslog_command.rs
test_operations.rs
test_print_command.rs
test_rebase_command.rs
test_resolve_command.rs	jj resolve: option to parse conflict markers + tests	2022-12-03 15:12:40 -08:00
test_restore_command.rs	Make the choice and arguments of mergetool configurable	2022-12-03 15:12:40 -08:00
test_revset_output.rs	tests: update revset error message after 8b00a64ab2 and 48d10d648c	2022-11-29 16:12:55 +09:00
test_show_command.rs
test_sparse_command.rs
test_split_command.rs
test_squash_command.rs
test_templater.rs
test_touchup_command.rs	Make the choice and arguments of mergetool configurable	2022-12-03 15:12:40 -08:00
test_undo.rs
test_unsquash_command.rs
test_untrack_command.rs
test_workspaces.rs