8000 Merge pull request #522 from slavikus/master · libgit2/objective-git@f2adb0f · GitHub
[go: up one dir, main page]
Skip to content

Commit f2adb0f

Browse files
joshaberjoshaber
committed
Merge pull request #522 from slavikus/master
Adjusted GTMergeAnalysis type
2 parents cfa1089 + da89640 commit f2adb0f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎ObjectiveGit/GTRepository+Pull.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
1313

1414
/// An enum describing the result of the merge analysis.
1515
/// See `git_merge_analysis_t`.
16-
typedef NS_ENUM(NSInteger, GTMergeAnalysis) {
16+
typedef NS_OPTIONS(NSInteger, GTMergeAnalysis) {
1717
GTMergeAnalysisNone = GIT_MERGE_ANALYSIS_NONE,
1818
GTMergeAnalysisNormal = GIT_MERGE_ANALYSIS_NORMAL,
1919
GTMergeAnalysisUpToDate = GIT_MERGE_ANALYSIS_UP_TO_DATE,

0 commit comments

Comments
 (0)
0