mergetool: Add support for vimdiff.

diff --git a/reachable.c b/reachable.c
index 4dfee1dbe8acb4bb6dbf2570585974d0cca6f757..01760d70462927ad33c7976a50e31372863a45f9 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -104,7 +104,9 @@ static void walk_commit_list(struct rev_info *revs)
        }
 }
 
-static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+               const char *email, unsigned long timestamp, int tz,
+               const char *message, void *cb_data)
 {
        struct object *object;
        struct rev_info *revs = (struct rev_info *)cb_data;
@@ -186,9 +188,9 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog)
        /* Add all external refs */
        for_each_ref(add_one_ref, revs);
 
-       /* Add all reflog info from refs */
+       /* Add all reflog info */
        if (mark_reflog)
-               for_each_ref(add_one_reflog, revs);
+               for_each_reflog(add_one_reflog, revs);
 
        /*
         * Set up the revision walk - this will move all commits