diff options
Diffstat (limited to 'tests/merge/files.c')
| -rw-r--r-- | tests/merge/files.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/merge/files.c b/tests/merge/files.c index 2d55df2b2..daa73fada 100644 --- a/tests/merge/files.c +++ b/tests/merge/files.c @@ -4,6 +4,7 @@ #include "buffer.h" #include "merge.h" #include "merge_helpers.h" +#include "conflict_data.h" #include "refs.h" #include "fileops.h" #include "diff_xdiff.h" |