Evan Mesterhazy 65a525cfd9 Add a test for splitting the parent of a merge commit without --siblings ... This is the same as the `test_split_siblings_with_merge_child` added in https://github.com/martinvonz/jj/pull/3485, but without the siblings flag. I forgot to add the non-siblings version in that PR. #3485		2024-04-11 14:58:55 -04:00
..
examples	cli: use RevisionArg type in "resolve -r", "bench", and example command	2024-04-03 15:30:30 +09:00
src	New jj debug watchman status command	2024-04-11 10:55:59 -07:00
testing	revset: add support for file(kind:pattern) syntax	2024-04-07 19:43:29 +09:00
tests	Add a test for splitting the parent of a merge commit without --siblings	2024-04-11 14:58:55 -04: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