diff options
Diffstat (limited to 'tests/merge/files.c')
| -rw-r--r-- | tests/merge/files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/files.c b/tests/merge/files.c index 27c96363f..6877f9848 100644 --- a/tests/merge/files.c +++ b/tests/merge/files.c @@ -6,7 +6,7 @@ #include "merge_helpers.h" #include "conflict_data.h" #include "refs.h" -#include "fileops.h" +#include "futils.h" #include "diff_xdiff.h" #define TEST_REPO_PATH "merge-resolve" |
