Yuya Nishihara 529acb3d16 merge_tools: process "ui.diff-instructions" option by caller ... This gets rid of the last UserSettings dependency from edit_diff_external(). I'm going to remove it from edit_diff() too, and let callers pass a preconfigured MergeTool struct instead. These changes will make it easier to add --tool=<name> argument #2575.		2024-03-02 10:31:27 +09:00
..
common	tests: move strip_last_line() to common module	2024-03-01 08:51:06 +09:00
cli-reference@.md.snap	cli: document that we create a new working-copy commit for abandoned one	2024-02-25 18:52:10 -08:00
runner.rs
test_abandon_command.rs
test_alias.rs
test_branch_command.rs	cli branch list: list tracked branches	2024-02-26 01:05:07 +00:00
test_builtin_aliases.rs
test_cat_command.rs
test_checkout.rs
test_chmod_command.rs
test_commit_command.rs
test_commit_template.rs	templater: add string.len() and list.len() methods	2024-03-01 08:51:20 +09:00
test_concurrent_operations.rs
test_config_command.rs
test_debug_command.rs
test_describe_command.rs
test_diff_command.rs	cli: don't ignore 'diff --tool=:builtin', report error	2024-03-01 08:51:06 +09:00
test_diffedit_command.rs	merge_tools: process "ui.diff-instructions" option by caller	2024-03-02 10:31:27 +09:00
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	tests: move strip_last_line() to common module	2024-03-01 08:51:06 +09:00
test_git_push.rs
test_git_remotes.rs
test_git_submodule.rs
test_gitignores.rs
test_global_opts.rs	tests: move strip_last_line() to common module	2024-03-01 08:51:06 +09:00
test_immutable_commits.rs
test_init_command.rs	tests: move strip_last_line() to common module	2024-03-01 08:51:06 +09:00
test_interdiff_command.rs
test_log_command.rs	templater: turn some integer overflow into evaluation error	2024-02-29 00:39:31 +09:00
test_move_command.rs
test_new_command.rs
test_next_prev_commands.rs
test_obslog_command.rs
test_operations.rs	templater: turn some integer overflow into evaluation error	2024-02-29 00:39:31 +09:00
test_rebase_command.rs	cli: make rebase --skip-empty keep already empty commits	2024-02-25 16:39:05 -08:00
test_repo_change_report.rs
test_resolve_command.rs
test_restore_command.rs
test_revset_output.rs	revset: add hint to innermost error	2024-02-28 09:03:04 +09:00
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	templater: expand similarity hint with aliases	2024-02-28 09:03:04 +09:00
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	workspace: make recovery commit empty instead of deleting everything	2024-02-27 06:45:25 -08:00