New upstream version 0.28.1+dfsg.1

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

diff --git a/tests/merge/trees/modeconflict.c b/tests/merge/trees/modeconflict.c
index d858b8f66f71dcd508015bb439ce88cb439bf3ee..e85e340b98c5dc19b7e54fb88361552f69f5e280 100644 (file)
--- a/tests/merge/trees/modeconflict.c
+++ b/tests/merge/trees/modeconflict.c
@@ -13,7 +13,7 @@ static git_repository *repo;
 #define DF_SIDE1_BRANCH                "df_side1"
 #define DF_SIDE2_BRANCH                "df_side2"
 
-// Fixture setup and teardown
+/* Fixture setup and teardown */
 void test_merge_trees_modeconflict__initialize(void)
 {
        repo = cl_git_sandbox_init(TEST_REPO_PATH);