Martin von Zweigbergk 9d7ed54f8e git_backend: add a README to conflicted commits ... When you use e.g. `git switch` to check out a conflicted commit, you're going to end up with the `.jjconflicts-*` directories in your working copy. It's probably not obvious what those mean. This patch adds a README file to the root tree to try to explain to users what's going on and how to recover. The authoritative information about conflicts is stored in the `jj:trees` commit header. The contents of conflicted commits is only used for preventing GC. We can therefore add contents to the tree without much consequence.		2024-04-22 06:22:54 -07:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
src	git_backend: add a README to conflicted commits	2024-04-22 06:22:54 -07:00
tests	tests: compare git refs loaded from disk, not in-memory cache values	2024-04-22 18:46:28 +09:00
testutils	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
Cargo.toml	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00