Commit ef887151 by nulltoken

Fix compilation warning

parent e090a568
...@@ -116,7 +116,7 @@ void test_object_tree_duplicateentries__cannot_create_a_duplicate_entry_through_ ...@@ -116,7 +116,7 @@ void test_object_tree_duplicateentries__cannot_create_a_duplicate_entry_through_
tree_checker(&tid, "4e0883eeeeebc1fb1735161cea82f7cb5fab7e63", GIT_FILEMODE_TREE); tree_checker(&tid, "4e0883eeeeebc1fb1735161cea82f7cb5fab7e63", GIT_FILEMODE_TREE);
} }
void add_fake_conflicts(git_index *index) static void add_fake_conflicts(git_index *index)
{ {
git_index_entry ancestor_entry, our_entry, their_entry; git_index_entry ancestor_entry, our_entry, their_entry;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment