Ilya Grigoriev 02a04d0d37 test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests ... Apart from (IMO) looking nicer, this will also sidestep the potential problem that if the file contains actual jj conflict markers (`>>>>>>>` in the beginning of a line, for example), jj would currently have trouble materializing and subsequently parsing conflicts in the file if it actually became conflicted. I'll demo this bug in either this or a subsequent PR. It's the kind of bug that sounds serious in theory but might never cause a problem in practice. After this PR, only `docs/tutorial.md` has a conflict marker that's not indented. There's only one there, so hopefully it won't be too much of a pain to deal with. I also indented other strings in `test_conflicts.rs`. IMO, this looks nice and more consistent with the `insta::assert_snapshot` output. I didn't spend the time to do the same for `test_resolve_command`.		2024-03-22 23:27:25 -07:00
..
examples	templater: allow use of wrap_<type>() functions without borrowing &language	2024-03-22 11:51:15 +09:00
src	cli: avoid bad hint "Prefix the expression with 'all'..."	2024-03-23 10:05:18 +05:00
testing	revset: substitute '~(::x)' to 'x..'	2024-03-17 14:50:48 +09:00
tests	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
build.rs
Cargo.toml	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
LICENSE