diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2013-01-23 14:44:09 +0400 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2013-01-23 17:00:42 +0400 |
| commit | ec04a5706566b448c9084a13616a0a6497f93637 (patch) | |
| tree | 74b545d662f8188299526181ea74b6f3f74401f3 /LibGit2Sharp/Core/Ensure.cs | |
| parent | a41d33626920b627573e76d0324d67ade5cd8d43 (diff) | |
Make Checkout raise proper MergeConflictException
Diffstat (limited to 'LibGit2Sharp/Core/Ensure.cs')
| -rw-r--r-- | LibGit2Sharp/Core/Ensure.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/LibGit2Sharp/Core/Ensure.cs b/LibGit2Sharp/Core/Ensure.cs index 48031117..dacbe58a 100644 --- a/LibGit2Sharp/Core/Ensure.cs +++ b/LibGit2Sharp/Core/Ensure.cs @@ -90,6 +90,9 @@ namespace LibGit2Sharp.Core case (int)GitErrorCode.UnmergedEntries: throw new UnmergedIndexEntriesException(errorMessage, (GitErrorCode)result, error.Category); + case (int)GitErrorCode.MergeConflict: + throw new MergeConflictException(errorMessage, (GitErrorCode)result, error.Category); + default: throw new LibGit2SharpException(errorMessage, (GitErrorCode)result, error.Category); } |