Martin von Zweigbergk 4c46398b1c conflicts: make update_from_content() write resolved content to store ... `update_from_content()` already writes file content for each term of an unresolved merge, so it seems consistent for it to also write the file content for resolved merges. I think this should simplify further refactoring for tree-level conflicts and for preserving the executable bit.		2023-08-11 23:59:44 +00:00
..
examples	cargo: move examples/ into cli/ so they are part of the build again	2023-08-07 21:49:45 +00:00
src	conflicts: make update_from_content() write resolved content to store	2023-08-11 23:59:44 +00:00
testing	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
tests	Update docs and errors to use XDG config path	2023-08-11 13:21:44 -07:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00