浏览代码

Pass along file_merger argument.

Jelmer Vernooij 5 年之前
父节点
当前提交
3a62248b8d
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      dulwich/merge.py

+ 2 - 1
dulwich/merge.py

@@ -199,7 +199,8 @@ def merge(repo, commit_ids, rename_detector=None, file_merger=None):
             repo.object_store[this_id].tree,
             repo.object_store[other_id].tree,
             repo.object_store[merge_base].tree,
-            rename_detector=rename_detector):
+            rename_detector=rename_detector,
+            file_merger=file_merger):
 
         if isinstance(entry, MergeConflict):
             conflicts.append(entry)