mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-28 23:55:54 +00:00
dd98f0564e
We store conflicts as blobs with JSON data and with a git note pointing to them to prevent GC. These are stored in the git tree as regular files. The only thing that distinguishes them is that their filename ends with `.jjconflict`. Since they are referenced from the tree, there's no need for the git note to prevent GC (which doesn't work anyway, as I just learned), and we don't store any additional data in the note either, so let's just remove it. |
||
---|---|---|
.. | ||
protos | ||
src | ||
tests | ||
build.rs | ||
Cargo.toml |