Skip to content

Commit 85f1f1b

Browse files
authored
Fix incorrect information in exceptions
The parameters displayed in "Unknown fast forward strategy" and "Unknown merge analysis" were swapped. This change fixes that.
1 parent 6189846 commit 85f1f1b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

LibGit2Sharp/Repository.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1500,13 +1500,13 @@ private MergeResult Merge(AnnotatedCommitHandle[] annotatedCommits, Signature me
15001500
break;
15011501
default:
15021502
throw new NotImplementedException(
1503-
string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", mergeAnalysis));
1503+
string.Format(CultureInfo.InvariantCulture, "Unknown fast forward strategy: {0}", fastForwardStrategy));
15041504
}
15051505

15061506
if (mergeResult == null)
15071507
{
15081508
throw new NotImplementedException(
1509-
string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", options.FastForwardStrategy));
1509+
string.Format(CultureInfo.InvariantCulture, "Unknown merge analysis: {0}", mergeAnalysis));
15101510
}
15111511

15121512
return mergeResult;

0 commit comments

Comments
 (0)