Merge pull request #1919 from OronDF343/patch-1

Fix incorrect information in exceptions

Merge pull request #1919 from OronDF343/patch-1
Fix incorrect information in exceptions
1e6da83a · Brandon Ording · GitHub · ec8ff4a8 · 85f1f1b7 · 1e6da83a
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

LibGit2Sharp/Repository.cs LibGit2Sharp/Repository.cs +2 -2

未找到文件。
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -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;