summaryrefslogtreecommitdiff
path: root/tests/merge/trees/modeconflict.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/merge/trees/modeconflict.c')
-rw-r--r--tests/merge/trees/modeconflict.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/merge/trees/modeconflict.c b/tests/merge/trees/modeconflict.c
index 32866ea6d..a0521c4e8 100644
--- a/tests/merge/trees/modeconflict.c
+++ b/tests/merge/trees/modeconflict.c
@@ -1,7 +1,6 @@
#include "clar_libgit2.h"
#include "git2/repository.h"
#include "git2/merge.h"
-#include "buffer.h"
#include "merge.h"
#include "../merge_helpers.h"
#include "futils.h"