mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-25 07:56:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
jj/cli
History
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
..
examples templater: leverage TemplateProperty::map/and_then() helpers 2024-03-23 16:22:17 +09:00
src git_backend: classify "merge with root" as user error 2024-03-30 11:14:25 +09:00
testing
tests git_backend: classify "merge with root" as user error 2024-03-30 11:14:25 +09: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