Martin von Zweigbergk e48ace56d1 conflicts: replace missing files by empty in materialized conflict ... When we materialize modify/delete conflicts, we currently don't include any context lines. That's because modify/delete conflicts have only two sides, so there's no common base to compare to. Hunks that are unchanged on the "modify" side are therefore not considered conflicting, and since they they don't contribute new changes, they're simply skipped (here: 3dfedf5814/lib/src/files.rs (L228-L230)). It seems more useful to instead pretend that the missing side is an empty file. That way we'll get a conflict in the entire file. We can still decide later to make e.g. `jj resolve` prompt the user on modify/delete conflicts just like `hg resolve` does (or maybe it actually happens earlier there, I don't remember). Closes #1244.		2023-02-17 22:19:04 -08:00
..
common	tests: pass string instead of bytes to add_config()	2023-01-26 12:48:30 -08:00
test_abandon_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_alias.rs	templater: use reverse-alphabet hex for change ids	2023-02-13 22:49:21 -08:00
test_branch_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_cat_command.rs	cli: rename print to cat	2023-01-18 10:10:02 -08:00
test_checkout.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_commit_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_commit_template.rs	config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias	2023-02-16 11:43:17 +09:00
test_concurrent_operations.rs	Make ui.relative-timestamps default to true	2023-02-15 21:26:14 -08:00
test_config_command.rs	Don't output implicit defaults from "config list"	2023-02-01 19:49:57 -06:00
test_debug_command.rs	Add "jj debug config-schema" command to output JSON schema	2023-01-03 22:02:25 -06:00
test_describe_command.rs	tests: pass string instead of bytes to add_config()	2023-01-26 12:48:30 -08:00
test_diff_command.rs	templater: do not complete "(no commit description)" by default	2023-02-01 16:13:43 +09:00
test_diffedit_command.rs	tests: make fake editor scripts initially empty	2023-01-25 21:58:38 -08:00
test_duplicate_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_edit_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_git_clone.rs
test_git_colocated.rs	templater: use reverse-alphabet hex for change ids	2023-02-13 22:49:21 -08:00
test_git_fetch.rs	git fetch: prune old branch names before adding new ones	2023-02-12 02:10:17 +01:00
test_git_import_export.rs	git: add git.auto-local-branch	2023-01-29 20:17:49 -08:00
test_git_push.rs	cli: use reverse-alphabet hex for branch name in jj git push --change	2023-02-13 22:49:21 -08:00
test_git_remotes.rs
test_gitignores.rs
test_global_opts.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_init_command.rs	templater: use reverse-alphabet hex for change ids	2023-02-13 22:49:21 -08:00
test_interdiff_command.rs
test_log_command.rs	config: remove ui.log-author-format in favor of template alias	2023-02-16 11:43:17 +09:00
test_move_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_new_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_obslog_command.rs	conflicts: replace missing files by empty in materialized conflict	2023-02-17 22:19:04 -08:00
test_operations.rs	Rename ui.relative-timestamps to ui.oplog-relative-timestamps	2023-02-15 21:26:14 -08:00
test_rebase_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_resolve_command.rs	conflicts: replace missing files by empty in materialized conflict	2023-02-17 22:19:04 -08:00
test_restore_command.rs	cmd: Remove the -i option to jj restore.	2022-12-21 08:15:06 -08:00
test_revset_output.rs	templater: use reverse-alphabet hex for change ids	2023-02-13 22:49:21 -08:00
test_show_command.rs	config: migrate log/show timestamp format away from config knob	2023-02-16 11:43:17 +09:00
test_sparse_command.rs
test_split_command.rs	templater: use reverse-alphabet hex for change ids	2023-02-13 22:49:21 -08:00
test_squash_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_status_command.rs	cli: append "\n" to commit description specified by -m/--message	2022-12-22 14:59:03 +09:00
test_templater.rs	templater: save alias chain to report type/name error in original context	2023-02-14 10:06:28 +09:00
test_undo.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_unsquash_command.rs	cli: switch default graph style to be Sapling's curved style	2023-02-12 07:23:29 -08:00
test_untrack_command.rs	tests: pass string instead of bytes to add_config()	2023-01-26 12:48:30 -08:00
test_workspaces.rs	config: rename [template] section to [templates], drop .graph suffix	2023-02-15 00:23:48 +09:00