adapt to changes in gix-merge

Author: Byron

gitoxide-core/src/repository/merge.rs

@@ -1,5 +1,5 @@
 use crate::OutputFormat;
-use anyhow::{bail, Context};
+use anyhow::{anyhow, bail, Context};
 use gix::bstr::BString;
 use gix::bstr::ByteSlice;
 use gix::merge::blob::builtin_driver::binary;
@@ -83,8 +83,11 @@ pub fn file(
         other: Some(theirs.as_bstr()),
     };
     let mut buf = repo.empty_reusable_buffer();
-    let (pick, resolution) = platform.merge(&mut buf, labels, repo.command_context()?)?;
-    let buf = platform.buffer_by_pick(pick).unwrap_or(&buf);
+    let (pick, resolution) = platform.merge(&mut buf, labels, &repo.command_context()?)?;
+    let buf = platform
+        .buffer_by_pick(pick)
+        .map_err(|_| anyhow!("Participating object was too large"))?
+        .unwrap_or(&buf);
     out.write_all(buf)?;
 
     if resolution == Resolution::Conflict {