diff options
Diffstat (limited to 'tests/merge/trees/automerge.c')
| -rw-r--r-- | tests/merge/trees/automerge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c index c18881d7c..67f2cf786 100644 --- a/tests/merge/trees/automerge.c +++ b/tests/merge/trees/automerge.c @@ -3,8 +3,9 @@ #include "git2/merge.h" #include "buffer.h" #include "merge.h" -#include "../merge_helpers.h" #include "fileops.h" +#include "../merge_helpers.h" +#include "../conflict_data.h" static git_repository *repo; |