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
..
examples	working_copy: allow load_working_copy() to return error	2024-04-19 15:22:37 -07:00
src	rebase: do not simplify ancestor merges	2024-04-22 21:05:49 +08:00
testing	revset: add support for file(kind:pattern) syntax	2024-04-07 19:43:29 +09:00
tests	git_backend: add a README to conflicted commits	2024-04-22 06:22:54 -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: 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