Martin von Zweigbergk 99fec7ed06 working_copy: don't re-read resolved conflict from disk on snapshot ... 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.		2023-07-24 15:14:42 -07:00
..
benches
gen-protos
src	working_copy: don't re-read resolved conflict from disk on snapshot	2023-07-24 15:14:42 -07:00
tests	revset: extract graph-related types to separate module	2023-07-25 01:45:37 +09:00
testutils	cargo: bump the cargo-dependencies group with 3 updates	2023-07-21 15:34:03 +00:00
Cargo.toml	revset_graph: add helper to test graph sorting	2023-07-25 01:45:37 +09:00