Expose GTPullMergeConflictedFiles key

pietbrauer · pietbrauer · commit 8143f7fde759 · 2016-02-03T10:01:41.000+08:00
diff --git a/ObjectiveGit/GTRepository+Pull.h b/ObjectiveGit/GTRepository+Pull.h
@@ -11,6 +11,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSString * const GTPullMergeConflictedFiles;
+
 /// An enum describing the result of the merge analysis.
 /// See `git_merge_analysis_t`.
 typedef NS_OPTIONS(NSInteger, GTMergeAnalysis) {
diff --git a/ObjectiveGitTests/GTRepository+PullSpec.m b/ObjectiveGitTests/GTRepository+PullSpec.m
@@ -258,7 +258,7 @@
 			}];
 			expect(@(result)).to(beFalsy());
 			expect(error.domain).to(equal(@"GTGitErrorDomain"));
-			expect(error.userInfo[@"GTPullMergeConflictedFiles"]).to(equal(@[@"test.txt"]));
+			expect(error.userInfo[GTPullMergeConflictedFiles]).to(equal(@[@"test.txt"]));
 			expect(error.localizedDescription).to(equal(@"Merge conflict, Pull aborted."));
 			expect(@(transferProgressed)).to(beTruthy());
 		});
