Yuya Nishihara f20004fffe git_backend: classify "merge with root" as user error ... Perhaps, there will be more error types that hold BackendError internally, but this change is good enough to handle a merge error.		2024-03-30 11:14:25 +09:00
..
benches
gen-protos
proc-macros	cargo: mark the jj-lib-proc-macros crate for publish	2024-03-06 20:35:38 -08:00
src	git_backend: classify "merge with root" as user error	2024-03-30 11:14:25 +09:00
tests	rewrite: update references after rewriting all commits	2024-03-25 23:00:44 -07:00
testutils
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