mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-07 04:51:45 +00:00
afa2f2deca
Currently, `jj resolve` always sets the file to be non-executable whenever a conflict is fully resolved. This is confusing, because it can cause the executable bit to be lost even if every side agrees that the file is executable. |
||
---|---|---|
.. | ||
examples | ||
src | ||
testing | ||
tests | ||
build.rs | ||
Cargo.toml | ||
docs | ||
LICENSE |