mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-28 10:31:14 +00:00
FileConflict will be changed to not materialize Merge<BString>. I also updated the revset engine to ignore non-file conflict. It doesn't make sense to grep conflict description.