Scott Taylor e6a51d6637 git: add dummy conflict to index if necessary ... If the parent tree contains conflicts, we want the index to also contain a conflict to ensure that the use can't accidentally commit conflict markers using `git commit`. Since we can't represent conflicts with more than 2 sides in the Git index, we need to add a dummy conflict in this case. We use ".jj-do-not-resolve-this-conflict" as the dummy conflict to indicate to the user that they should not attempt to resolve this conflict using Git.		2025-01-06 19:17:51 -06:00
..
examples	examples: use settings_for_new_workspace() when initializing workspace	2025-01-06 21:15:28 +09:00
src	git: use gix instead of git2 to update index	2025-01-06 19:17:51 -06:00
testing	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
tests	git: add dummy conflict to index if necessary	2025-01-06 19:17:51 -06:00
build.rs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
Cargo.toml	cli: add test that runs basic jj commands with minimal configuration	2025-01-04 17:54:28 +09:00
docs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00