diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/merge/merge_helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
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( |