convert "oidcmp() != 0" to "!oideq()"

diff --git a/builtin/merge.c b/builtin/merge.c
index 57abff999b429899e69835baff188e2f3f25f9f8..8d85d31a61b8fbb53b04a9f506c0d7aca93e35d9 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1521,7 +1521,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                         * HEAD^^" would be missed.
                         */
                        common_one = get_merge_bases(head_commit, j->item);
-                       if (oidcmp(&common_one->item->object.oid, &j->item->object.oid)) {
+                       if (!oideq(&common_one->item->object.oid, &j->item->object.oid)) {
                                up_to_date = 0;
                                break;
                        }