contrib/completion: add smerge to the mergetool completion candidates

diff --git a/blame.h b/blame.h
index 9b5240fb6dfc3a144a579a15807f4809e92b960e..be3a895043e07a2508d407ac35e74d634acd7886 100644 (file)
--- a/blame.h
+++ b/blame.h
@@ -102,6 +102,7 @@ struct blame_scoreboard {
        struct commit *final;
        /* Priority queue for commits with unassigned blame records */
        struct prio_queue commits;
+       struct repository *repo;
        struct rev_info *revs;
        const char *path;