Merge branch 'es/format-patch-interdiff'

diff --git a/notes-merge.c b/notes-merge.c
index 76ab19e702423aeb511bfc1e939a7998c61fab61..12dfdf6c17015442d51577a0b621ec20d344ca20 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -12,6 +12,7 @@
 #include "notes-merge.h"
 #include "strbuf.h"
 #include "notes-utils.h"
+#include "commit-reach.h"
 
 struct notes_merge_pair {
        struct object_id obj, base, local, remote;