forked from mirrors/jj
ebfe0a4823
To fix #463, I think we want to skip conflicted branches when we export instead of erroring out. It seems we didn't have test case for the current behavior, so let's add one. |
||
---|---|---|
.. | ||
src | ||
tests | ||
testutils | ||
build.rs | ||
Cargo.toml |