Evan Mesterhazy 37be542ebf Fix a bug when the target of jj split has merge commit children ... Ilya reported this in https://github.com/martinvonz/jj/issues/3483. The bug was introduced in 976320726d. Before this fix, `jj split` dropped any parents what weren't involved in the split when it rebased the children of the commit being split. This meant that any children which were merge commits lost their other parents unintentionally. Fixes #3483		2024-04-11 13:26:07 -04:00
..
examples	cli: use RevisionArg type in "resolve -r", "bench", and example command	2024-04-03 15:30:30 +09:00
src	Fix a bug when the target of jj split has merge commit children	2024-04-11 13:26:07 -04:00
testing	revset: add support for file(kind:pattern) syntax	2024-04-07 19:43:29 +09:00
tests	Fix a bug when the target of jj split has merge commit children	2024-04-11 13:26:07 -04: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	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00