t7610: add mergetool --gui tests

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 9bd4a95a4773474be1ac649623ef5a73028d7b78..456797c12a41a468a0b6dd25153403f6cfd7bb2f 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -384,7 +384,7 @@ static void show_filemodify(struct diff_queue_struct *q,
                                string_list_insert(changed, spec->path);
                                putchar('\n');
 
-                               if (!oidcmp(&ospec->oid, &spec->oid) &&
+                               if (oideq(&ospec->oid, &spec->oid) &&
                                    ospec->mode == spec->mode)
                                        break;
                        }