Commit 94beb3a3f4a9bad33476673468f52d6caf81acc0
2020-01-18T14:03:23
merge: update enum type name for consistency libgit2 does not use `type_t` suffixes as it's redundant; thus, rename `git_merge_diff_type_t` to `git_merge_diff_t` for consistency.
diff --git a/src/merge.h b/src/merge.h
index 173a1b4..b0a7de2 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 e407c7d..166b4ee 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(