mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 07:43:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
4644 commits 111 branches 30 tags 70 MiB
Commit graph

53 commits

Author SHA1 Message Date
Martin von Zweigbergk
9abee0096f conflicts: propagate errors from materialize_conflict() 
All current callers pass in a buffer, so it should never fail, but the
function itself can't know that.
 2021-10-24 23:02:00 -07:00
Martin von Zweigbergk
c0a26f7642 conflicts: work around rust-lang/rust#89716 2021-10-13 13:41:09 -07:00
Martin von Zweigbergk
b4b64eb7e5 conflicts: add tests of conflict materialization 2021-10-13 13:40:25 -07:00