summaryrefslogtreecommitdiff
path: root/src/merge_file.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/merge_file.c')
-rw-r--r--src/merge_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge_file.c b/src/merge_file.c
index 0647a5df6..23daa84c4 100644
--- a/src/merge_file.c
+++ b/src/merge_file.c
@@ -9,7 +9,7 @@
#include "repository.h"
#include "posix.h"
-#include "fileops.h"
+#include "futils.h"
#include "index.h"
#include "diff_xdiff.h"
#include "merge.h"