X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=7845528e88eea6a42f914b5bf596473eb33dea40;hb=4b9447f98ef8699450fa0276d212167a25667d7f;hp=f7f4533926e35867725db00f0c89522c4b290898;hpb=cfa775c10ef698c7b84e2d460d04272993c30da4;p=git.git

diff --git a/merge-file.c b/merge-file.c
index f7f453392..7845528e8 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -3,6 +3,7 @@
 #include "xdiff-interface.h"
 #include "ll-merge.h"
 #include "blob.h"
+#include "merge-file.h"
 
 static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
 {