X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-file.c;h=7845528e88eea6a42f914b5bf596473eb33dea40;hb=26c3177ee41897af984fac9148763131562accf2;hp=f7f4533926e35867725db00f0c89522c4b290898;hpb=90e8b9b23dff20946a0eacdf8abedce7e32c1d78;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)
 {