mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
6304 commits 118 branches 30 tags 49 MiB
Commit graph

2 commits

Author SHA1 Message Date
Martin von Zweigbergk
65a988e3d2 merged_tree: make tree builder attempt to resolve conflicts 
As we discovered in the `jj fix` tests,
`MergedTreeBuilder::write_tree()` doesn't try to resolve conflicts,
not even trivial ones. This patch fixes that.
 2024-06-08 20:29:30 +09:00
Danny Hooper
3050685ff3 cli: implement enough of jj fix to run a single tool on all files 2024-06-04 14:28:21 -05:00