Ilya Grigoriev f43a810fe0 conflicts.rs: Teach jj to parse conflict markers that are followed by a label ... The format is 7 characters of the separator followed by a space and arbitrary text, followed by a newline. Separator followed by a newline is also allowed. E.g.: <<<<<<< Random text %%%%%%% Random text line 2 -line 3 +left line 4 +++++++ Random text right %%%%%%% Random text line 2 +forward line 3 line 4 >>>>>>> Random text This commit only allows reading such conflicts. I considered allowing longer separators (`<<<<<<<<<<<<<< Random text`), but we wouldn't currently write them, so let's be strict for now. 7 characters if they are followed by a space and arbitrary text		2024-05-05 18:42:14 -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	conflicts.rs: Teach jj to parse conflict markers that are followed by a label	2024-05-05 18:42:14 -07:00
tests	conflicts.rs: Teach jj to parse conflict markers that are followed by a label	2024-05-05 18:42:14 -07:00
testutils	merged_tree: propagate errors from TreeEntriesIterator	2024-05-01 06:10:08 -07: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