未验证 提交 85f1f1b7 编写于 作者: O OronDF343 提交者: GitHub

Fix incorrect information in exceptions

The parameters displayed in "Unknown fast forward strategy" and "Unknown merge analysis" were swapped. This change fixes that.
上级 6189846c
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册