merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/dir-iterator.h b/dir-iterator.h
index 27739e6c29560492254c7fb7e22170cd1ff327ba..970793d07a1d72761159adca51d16859c7b72a29 100644 (file)
--- a/dir-iterator.h
+++ b/dir-iterator.h
@@ -1,6 +1,8 @@
 #ifndef DIR_ITERATOR_H
 #define DIR_ITERATOR_H
 
+#include "strbuf.h"
+
 /*
  * Iterate over a directory tree.
  *