diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2011-12-08 23:33:53 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2011-12-08 23:33:53 +0100 |
| commit | 26b573862912b2faf3824bb18dfeb44a3b700014 (patch) | |
| tree | 6ed5e12926fd8157fb63b771e19813deabc0e27e /org.eclipse.jgit.ant | |
| parent | dfcb43eff1bbdc58b6d286b4d18256ce8af56a78 (diff) | |
| download | jgit-26b573862912b2faf3824bb18dfeb44a3b700014.tar.gz jgit-26b573862912b2faf3824bb18dfeb44a3b700014.zip | |
Throw API exception when MergeCommand hits checkout conflicts
When MergeCommand hit checkout conflicts it did throw an internal JGit
exception org.eclipse.jgit.errors.CheckoutConflictException instead of
org.eclipse.jgit.api.errors.CheckoutConflictException which it
declares to throw. Hence translate the internal exception to the
exception declared in the API.
Bug: 327573
Change-Id: I1efcd93a43ecbf4a40583e0fc9d8d53cffc98cae
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.ant')
0 files changed, 0 insertions, 0 deletions