Fix default value for file_flag in Repository.merge_commits

libgit2 · Jan 25, 2024 · 6c098b4 · 6c098b4
1 parent dde14c8
commit 6c098b4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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.