X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=tests%2Fmerge%2Fmerge_helpers.h;h=166b4eefddb68d66f277bb091b7cb4519a29ca18;hb=22a2d3d5efc740ba0dc69175b8bbb1e715e0257e;hp=e407c7d138fb457674c3b114fcf47748169ab0c5;hpb=b6832cbfa8d8c29e01c9a97276a8d05a70ccc268;p=libgit2.git

diff --git a/tests/merge/merge_helpers.h b/tests/merge/merge_helpers.h
index e407c7d13..166b4eefd 100644
--- 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(