From aa70b9bd50dcbf371645e5212fab40c154dc0d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20R=2E=20de=20Miranda?= <andre@galgo.tech>
Date: Wed, 25 Jan 2023 13:05:17 -0300
Subject: [PATCH] Add git_diff_merge

---
 diff.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/diff.go b/diff.go
index 308859a..8f471b5 100644
--- a/diff.go
+++ b/diff.go
@@ -157,6 +157,20 @@ func (diff *Diff) Delta(index int) (DiffDelta, error) {
 	return ret, nil
 }
 
+func (diff *Diff) Merge(from *Diff) error {
+	if diff.ptr == nil {
+		return ErrInvalid
+	}
+	ret := C.git_diff_merge(diff.ptr, from.ptr)
+	if ret < 0 {
+		return MakeGitError(ret)
+	}
+
+	runtime.KeepAlive(diff)
+	runtime.KeepAlive(from)
+	return nil
+}
+
 // deprecated: You should use `Diff.Delta()` instead.
 func (diff *Diff) GetDelta(index int) (DiffDelta, error) {
 	return diff.Delta(index)
-- 
2.45.2