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
..
gen-protos	cargo: bump prost-build from 0.11.5 to 0.11.6	2023-01-13 21:24:02 +00:00
src	conflicts: replace missing files by empty in materialized conflict	2023-02-17 22:19:04 -08:00
tests	conflicts: replace missing files by empty in materialized conflict	2023-02-17 22:19:04 -08:00
testutils	release: release version 0.7.0	2023-02-16 12:50:52 -08:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	release: release version 0.7.0	2023-02-16 12:50:52 -08:00