From ffd688472efa7c5b3f4b2e94bae3da30d6e01a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kurowski?= <crackcomm@gmail.com>
Date: Sat, 11 Nov 2023 18:21:16 +0100
Subject: [PATCH] merge_tools: use `right_file_mode` in `make_diff_files`

See the issue #2548 for more context.
---
 cli/src/merge_tools/builtin.rs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/cli/src/merge_tools/builtin.rs b/cli/src/merge_tools/builtin.rs
index ecf31a00a..4960962e0 100644
--- a/cli/src/merge_tools/builtin.rs
+++ b/cli/src/merge_tools/builtin.rs
@@ -350,7 +350,7 @@ pub fn make_diff_files(
         files.push(scm_record::File {
             old_path: None,
             path: Cow::Owned(changed_path.to_fs_path(Path::new(""))),
-            file_mode: None,
+            file_mode: Some(right_file_mode),
             sections,
         });
     }
@@ -587,7 +587,11 @@ mod tests {
             File {
                 old_path: None,
                 path: "unchanged",
-                file_mode: None,
+                file_mode: Some(
+                    FileMode(
+                        33188,
+                    ),
+                ),
                 sections: [
                     Unchanged {
                         lines: [
@@ -599,7 +603,11 @@ mod tests {
             File {
                 old_path: None,
                 path: "changed",
-                file_mode: None,
+                file_mode: Some(
+                    FileMode(
+                        33188,
+                    ),
+                ),
                 sections: [
                     Unchanged {
                         lines: [
@@ -644,7 +652,11 @@ mod tests {
             File {
                 old_path: None,
                 path: "added",
-                file_mode: None,
+                file_mode: Some(
+                    FileMode(
+                        33188,
+                    ),
+                ),
                 sections: [
                     Changed {
                         lines: [