xdiff: remove duplicate headers from xpatience.c

diff --git a/blame.h b/blame.h
index be3a895043e07a2508d407ac35e74d634acd7886..d62f80fa74c44011f8cdaea7a4baec3d8cae03e6 100644 (file)
--- a/blame.h
+++ b/blame.h
@@ -52,7 +52,7 @@ struct blame_origin {
        struct blame_entry *suspects;
        mmfile_t file;
        struct object_id blob_oid;
-       unsigned mode;
+       unsigned short mode;
        /* guilty gets set when shipping any suspects to the final
         * blame list instead of other commits
         */
@@ -177,6 +177,6 @@ struct blame_entry *blame_entry_prepend(struct blame_entry *head,
                                        long start, long end,
                                        struct blame_origin *o);
 
-extern struct blame_origin *get_blame_suspects(struct commit *commit);
+struct blame_origin *get_blame_suspects(struct commit *commit);
 
 #endif /* BLAME_H */