How to delete a file?

[marcinjahn]

There are cases where one side of the conflict modified some file, while the other side completely removed the file. How to take the removal as the outcome?

[rafikdraoui]

It's not currently possible to do so from within jj-diffconflicts. By design, it works solely off the materialized conflict markers, and there is currently no way to distinguish between a deleted file and an empty file. Issue https://github.com/jj-vcs/jj/issues/5496 mentions the idea of representing deleted files in conflicts markers, so maybe this will be possible in the future.