Yuya Nishihara 08b5b66ad4 cli: let backend decide whether merge with root can be performed ... One less CLI revset helper. It might look odd that "jj rebase" says "Merge failed" whereas "jj new" doesn't, but that depends on where the BackendError is detected.		2024-03-30 11:14:25 +09:00
..
examples	templater: leverage TemplateProperty::map/and_then() helpers	2024-03-23 16:22:17 +09:00
src	cli: let backend decide whether merge with root can be performed	2024-03-30 11:14:25 +09:00
testing	revset: substitute '~(::x)' to 'x..'	2024-03-17 14:50:48 +09:00
tests	cli: let backend decide whether merge with root can be performed	2024-03-30 11:14:25 +09: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