diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2015-05-29 22:06:49 +0300 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2015-05-29 22:06:49 +0300 |
| commit | ba6b4b47faedbca9828afd3dd6aeaab890ea18c8 (patch) | |
| tree | 2a97ea2cf8b6a852ff1298f2facd7e45b3a172cd /Lib/CustomBuildTasks/CustomBuildTasks.csproj | |
| parent | adafc414c6b2abc2c2aaa09b3a06bcbdbe1018f5 (diff) | |
| parent | ac524f36fcb1840ec1fa54b394a7510a74c63306 (diff) | |
Merge pull request #1059 from libgit2/ethomson/mergeconflict
Introduce CheckoutConflictException
Diffstat (limited to 'Lib/CustomBuildTasks/CustomBuildTasks.csproj')
0 files changed, 0 insertions, 0 deletions