forked from mirrors/jj
73a8b13e4c
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. |
||
---|---|---|
.. | ||
examples | ||
src | ||
testing | ||
tests | ||
build.rs | ||
Cargo.toml | ||
LICENSE |