merge-base: use the new lookup_commit_reference() helper function

diff --git a/diff.h b/diff.h
index c146d8acf8601f81cb7b7baeaffcf85081e1eb1b..815987de52627d9762aa43cefd1ce897007f8ce5 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -31,7 +31,7 @@ struct diff_spec {
        unsigned file_valid : 1; /* if false the file does not even exist */
 };
 
-extern void run_external_diff(const char *name,
+extern void run_external_diff(const char *name, const char *other,
                              struct diff_spec *, struct diff_spec *);
 
 #endif /* DIFF_H */