From a33790e766c0a10ff83775ea756f1133b2e545e8 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Mon, 2 Dec 2024 17:18:54 +0100
Subject: [PATCH] Improve merge related API in `gix`

Inspired by https://github.com/gitbutlerapp/gitbutler/pull/5722
---
 gix/src/merge.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gix/src/merge.rs b/gix/src/merge.rs
index 2111fa98a71..0d0bb711581 100644
--- a/gix/src/merge.rs
+++ b/gix/src/merge.rs
@@ -107,7 +107,9 @@ pub mod commit {
 ///
 pub mod tree {
     use gix_merge::blob::builtin_driver;
-    pub use gix_merge::tree::{Conflict, ContentMerge, Resolution, ResolutionFailure, TreatAsUnresolved};
+    pub use gix_merge::tree::{
+        treat_as_unresolved, Conflict, ContentMerge, Resolution, ResolutionFailure, TreatAsUnresolved,
+    };
 
     /// The outcome produced by [`Repository::merge_trees()`](crate::Repository::merge_trees()).
     #[derive(Clone)]