mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-26 00:19:59 +00:00
99fec7ed06
When snapshotting a conflict, we read the contents and parse conflict markers. If we determine that it's no longer a conflict, then we write a normal file entry to the tree instead. When we do that, we re-read the file from the working copy. Let's instead write the file contents we already read. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |