From 6c098b4d4f072a31409ba4812c182d04501e355c Mon Sep 17 00:00:00 2001
From: Iliyas Jorio <iliyas@jor.io>
Date: Fri, 26 Jan 2024 00:26:30 +0100
Subject: [PATCH] Fix default value for file_flag in Repository.merge_commits

---
 pygit2/repository.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pygit2/repository.py b/pygit2/repository.py
index b05ed88c..4c7ebfeb 100644
--- a/pygit2/repository.py
+++ b/pygit2/repository.py
@@ -697,7 +697,7 @@ def merge_commits(
             theirs: typing.Union[str, Oid, Commit],
             favor = MergeFavor.NORMAL,
             flags = MergeFlag.FIND_RENAMES,
-            file_flags = MergeFavor.NORMAL,
+            file_flags = MergeFileFlag.DEFAULT,
             ) -> Index:
         """
         Merge two arbitrary commits.