Skip to content

Commit 644ba30

Browse files
author
Rodolfo Gatti
committed
Fixed formating issues
1 parent a2bf853 commit 644ba30

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

src/diff3.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,8 +2329,14 @@ mod tests {
23292329

23302330
// Normal format always returns false for has_conflicts (exit code 0)
23312331
// but should still produce diff output showing the differences
2332-
assert!(!has_conflicts, "Normal format always returns false for conflicts");
2333-
assert!(!output.is_empty(), "Should produce output showing differences");
2332+
assert!(
2333+
!has_conflicts,
2334+
"Normal format always returns false for conflicts"
2335+
);
2336+
assert!(
2337+
!output.is_empty(),
2338+
"Should produce output showing differences"
2339+
);
23342340
}
23352341

23362342
#[test]
@@ -2388,10 +2394,7 @@ mod tests {
23882394

23892395
// With initial_tab, content lines should be prefixed with a tab
23902396
// (without initial_tab they would be prefixed with two spaces)
2391-
assert!(
2392-
output_str.contains("\t"),
2393-
"Should have tab before content"
2394-
);
2397+
assert!(output_str.contains("\t"), "Should have tab before content");
23952398
}
23962399

23972400
#[test]

0 commit comments

Comments
 (0)