mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-05 11:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
618 commits 108 branches 30 tags 59 MiB
Commit graph

2 commits

Author SHA1 Message Date
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