|
|
|
@ -403,8 +403,6 @@ fn diff_file(
|
|
|
|
) -> DiffResult {
|
|
|
|
) -> DiffResult {
|
|
|
|
let (lhs_bytes, rhs_bytes) = read_files_or_die(lhs_path, rhs_path, missing_as_empty);
|
|
|
|
let (lhs_bytes, rhs_bytes) = read_files_or_die(lhs_path, rhs_path, missing_as_empty);
|
|
|
|
|
|
|
|
|
|
|
|
// Override here? Separate option or part of existing --override arg?
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let (mut lhs_src, mut rhs_src) = match (
|
|
|
|
let (mut lhs_src, mut rhs_src) = match (
|
|
|
|
guess_content(&lhs_bytes, lhs_path, binary_overrides),
|
|
|
|
guess_content(&lhs_bytes, lhs_path, binary_overrides),
|
|
|
|
guess_content(&rhs_bytes, rhs_path, binary_overrides),
|
|
|
|
guess_content(&rhs_bytes, rhs_path, binary_overrides),
|
|
|
|
|