merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/tree-diff.c b/tree-diff.c
index 553bc0e63ae37ada1c3e19ae748d1228561f00f6..425668e1e0b468d55e87dba69169acd53bba2c31 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -491,7 +491,7 @@ static struct combine_diff_path *ll_diff_tree_paths(
                                                continue;
 
                                        /* diff(t,pi) != ø */
-                                       if (oidcmp(t.entry.oid, tp[i].entry.oid) ||
+                                       if (!oideq(t.entry.oid, tp[i].entry.oid) ||
                                            (t.entry.mode != tp[i].entry.mode))
                                                continue;