New upstream version 1.1.0+dfsg.1

[libgit2.git] / tests / merge / merge_helpers.h

diff --git a/tests/merge/merge_helpers.h b/tests/merge/merge_helpers.h
index e407c7d138fb457674c3b114fcf47748169ab0c5..166b4eefddb68d66f277bb091b7cb4519a29ca18 100644 (file)
--- a/tests/merge/merge_helpers.h
+++ b/tests/merge/merge_helpers.h
@@ -36,7 +36,7 @@ struct merge_index_conflict_data {
        struct merge_index_with_status ancestor;
        struct merge_index_with_status ours;
        struct merge_index_with_status theirs;
-       git_merge_diff_type_t change_type;
+       git_merge_diff_t change_type;
 };
 
 int merge_trees_from_branches(