diff options
| -rw-r--r-- | src/merge.h | 4 | ||||
| -rw-r--r-- | tests/merge/merge_helpers.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/merge.h b/src/merge.h index 173a1b435..b0a7de2be 100644 --- a/src/merge.h +++ b/src/merge.h @@ -84,7 +84,7 @@ typedef enum { /* The child of a folder that is in a directory/file conflict. */ GIT_MERGE_DIFF_DF_CHILD = (1 << 11), -} git_merge_diff_type_t; +} git_merge_diff_t; typedef struct { git_repository *repo; @@ -113,7 +113,7 @@ typedef struct { * Description of changes to one file across three trees. */ typedef struct { - git_merge_diff_type_t type; + git_merge_diff_t type; git_index_entry ancestor_entry; 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( |