Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
pietbrauer committed Mar 3, 2016
1 parent b973182 commit 6323ca5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions ObjectiveGit/GTRepository+Merging.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@ typedef NS_OPTIONS(NSInteger, GTMergeAnalysis) {

/// Merge Branch into current branch
///
/// analysis - The resulting analysis.
/// fromBranch - The branch to merge from.
/// error - The error if one occurred. Can be NULL.
///
/// Returns YES if the nerge was successful, NO otherwise (and `error`, if provided,
/// Returns YES if the merge was successful, NO otherwise (and `error`, if provided,
/// will point to an error describing what happened).
- (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)fromBranch withError:(NSError **)error;

Expand Down

0 comments on commit 6323ca5

Please sign in to comment.