New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / merge / trees / whitespace.c

diff --git a/tests/merge/trees/whitespace.c b/tests/merge/trees/whitespace.c
index b99583cb33a35befdb51c2c4631aa51f04d2c81b..9917df506daf413a1534efd5bb85fbad5a2b70e0 100644 (file)
--- a/tests/merge/trees/whitespace.c
+++ b/tests/merge/trees/whitespace.c
@@ -1,10 +1,9 @@
 #include "clar_libgit2.h"
 #include "git2/repository.h"
 #include "git2/merge.h"
-#include "buffer.h"
 #include "merge.h"
 #include "../merge_helpers.h"
-#include "fileops.h"
+#include "futils.h"
 
 static git_repository *repo;
 
@@ -16,7 +15,7 @@ static git_repository *repo;
 #define BRANCH_A_CHANGE  "branch_a_change"
 #define BRANCH_B_CHANGE  "branch_b_change"
 
-// Fixture setup and teardown
+/* Fixture setup and teardown */
 void test_merge_trees_whitespace__initialize(void)
 {
        repo = cl_git_sandbox_init(TEST_REPO_PATH);