Merge branch 'pw/rebase-edit-message-for-replayed-merge'

diff --git a/merge-blobs.h b/merge-blobs.h
index cc31038b807fbee073a063ec83fe298c87fd2b3d..13cf9669e5b2c43b34bbecd2ea71bf14d9a36d65 100644 (file)
--- a/merge-blobs.h
+++ b/merge-blobs.h
@@ -4,8 +4,8 @@
 struct blob;
 struct index_state;
 
-extern void *merge_blobs(struct index_state *, const char *,
-                        struct blob *, struct blob *,
-                        struct blob *, unsigned long *);
+void *merge_blobs(struct index_state *, const char *,
+                 struct blob *, struct blob *,
+                 struct blob *, unsigned long *);
 
 #endif /* MERGE_BLOBS_H */