Skip to content

Commit

Permalink
Merge pull request #1919 from OronDF343/patch-1
Browse files Browse the repository at this point in the history
Fix incorrect information in exceptions
  • Loading branch information
bording authored Jan 4, 2022
2 parents ec8ff4a + 85f1f1b commit 1e6da83
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions LibGit2Sharp/Repository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1500,13 +1500,13 @@ private MergeResult Merge(AnnotatedCommitHandle[] annotatedCommits, Signature me
break;
default:
throw new NotImplementedException(
string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", mergeAnalysis));
string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", fastForwardStrategy));
}

if (mergeResult == null)
{
throw new NotImplementedException(
string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", options.FastForwardStrategy));
string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", mergeAnalysis));
}

return mergeResult;
Expand Down

0 comments on commit 1e6da83

Please sign in to comment.