Martin von Zweigbergk ddb07e639c merge_tools: simplify error message for complex conflicts ... Since e48ace56d1, the number of adds in the hunk is always exactly one more than enumber of removes, so we can simplify the condition and the error message accordingly.		2023-06-07 13:45:16 -07:00
..
common	TestEnvironment: make it easier to run integration tests with printf debugging	2023-05-14 19:59:50 -07:00
test_abandon_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_alias.rs	cargo: upgrade clap from to 4.1.11 to 4.3.0	2023-05-31 12:32:26 -07:00
test_branch_command.rs	cmd: prohibit creating branches at the root commit	2023-04-03 23:51:47 -07:00
test_cat_command.rs
test_checkout.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_commit_command.rs
test_commit_template.rs	cli: allow resolving shorter ids within a configured revset	2023-05-11 23:41:24 -07:00
test_concurrent_operations.rs	cli: reload both repo and wc commit if working copy was updated	2023-05-22 08:36:38 +09:00
test_config_command.rs
test_debug_command.rs	jj debug operation --display id option to show current operation id for tests	2023-06-07 13:42:48 -07:00
test_describe_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_diff_command.rs	Fix warnings in tests on non-Unix platforms	2023-05-01 13:37:31 +09:00
test_diffedit_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_duplicate_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_edit_command.rs	tests: avoid hardcoding commit/operation ids when possible	2023-05-22 07:02:32 -07:00
test_git_clone.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_git_colocated.rs	tests: avoid hardcoding commit/operation ids when possible	2023-05-22 07:02:32 -07:00
test_git_fetch.rs	cmd: when a single remote is defined, default to it for git fetch/push	2023-04-14 08:20:30 +03:00
test_git_import_export.rs	No-op clarification of import_export tests	2023-06-07 13:42:48 -07:00
test_git_push.rs	cli: add jj git push -r for pushing branches pointing to revset	2023-06-04 20:50:11 -07:00
test_git_remotes.rs
test_gitignores.rs
test_global_opts.rs	cargo: upgrade clap from to 4.1.11 to 4.3.0	2023-05-31 12:32:26 -07:00
test_init_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_interdiff_command.rs
test_log_command.rs	cleanup: fix clippy issues	2023-06-05 11:11:17 -05:00
test_move_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_new_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_obslog_command.rs	cli: allow resolving shorter ids within a configured revset	2023-05-11 23:41:24 -07:00
test_operations.rs	tests: avoid hardcoding commit/operation ids when possible	2023-05-22 07:02:32 -07:00
test_rebase_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_resolve_command.rs	merge_tools: simplify error message for complex conflicts	2023-06-07 13:45:16 -07:00
test_restore_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_revset_output.rs	cli: load revset/template aliases in order of config layers	2023-05-23 14:20:55 +09:00
test_show_command.rs
test_sparse_command.rs	cli: make jj sparse --list a subcommand	2023-05-22 09:49:38 -07:00
test_split_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_squash_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_status_command.rs
test_templater.rs	cli: load revset/template aliases in order of config layers	2023-05-23 14:20:55 +09:00
test_undo.rs
test_unsquash_command.rs	cli: print parent commit summary on checkout	2023-05-02 15:04:13 +09:00
test_untrack_command.rs	cli: make jj sparse --list a subcommand	2023-05-22 09:49:38 -07:00
test_util_command.rs	cli: rename jj support to jj util	2023-04-12 21:34:47 -07:00
test_workspaces.rs	cli: add pointer from error message to docs about stale working copy	2023-05-31 06:32:40 -07:00