Merge branch 'en/sequencer-empty-edit-result-aborts'

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index f8023bae1e2eceaa8ea086f5d990d8bc4c0e6121..8cea8a74f2b7e89dfedca3688f2b9d8863055010 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -155,7 +155,7 @@ static int same_entry(struct name_entry *a, struct name_entry *b)
 {
        return  a->oid &&
                b->oid &&
-               !oidcmp(a->oid, b->oid) &&
+               oideq(a->oid, b->oid) &&
                a->mode == b->mode;
 }