martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-11 13:56:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix style

Browse Source
This commit is contained in:
Bobbe 2024-07-11 16:49:38 +02:00
parent d9bea13df7
commit 9fc674131f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/merge_tools/builtin.rs
View File

@ -454,7 +454,7 @@ pub fn apply_diff_builtin(
}),
Some(Some(TreeValue::Symlink(_))) => Some(scm_record::FileMode(mode::SYMLINK)),
Some(None) => {
if contents == "" {
if contents.is_empty() {
None
} else {
file.get_file_mode()