From 09d605256ce812f1f2a6de5a881192cf9efc633a Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Mon, 19 Aug 2024 13:45:10 +0900
Subject: [PATCH] conflicts: make materialize_merge_result() accept reference
 type

Because the output of diff.hunks() is a list of [&BStr]s, a Merge object
reconstructed from a diff hunk will be Merge<&BStr>.
---
 lib/src/conflicts.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs
index e8db030c44..205839f93f 100644
--- a/lib/src/conflicts.rs
+++ b/lib/src/conflicts.rs
@@ -232,8 +232,8 @@ async fn materialize_tree_value_no_access_denied(
     }
 }
 
-pub fn materialize_merge_result(
-    single_hunk: &Merge<BString>,
+pub fn materialize_merge_result<T: AsRef<[u8]>>(
+    single_hunk: &Merge<T>,
     output: &mut dyn Write,
 ) -> io::Result<()> {
     let merge_result = files::merge(single_hunk);