diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2014-06-26 13:42:21 +0200 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2014-07-28 14:43:22 +0200 |
| commit | 289b7c60a9e232f7b37829c5aad858c7c13286b7 (patch) | |
| tree | 7a51956bd78935a766f08e5b24cf18a77a0817a5 /org.eclipse.jgit.http.server | |
| parent | 0c4553d28a34dfb64f4af68032a9a33ca297975e (diff) | |
| download | jgit-289b7c60a9e232f7b37829c5aad858c7c13286b7.tar.gz jgit-289b7c60a9e232f7b37829c5aad858c7c13286b7.zip | |
Fixed message for exception thrown during recursive merge
During recursive merge jgit potentially has to merge multiple
common ancestors. If this fails because there are conflicts then
the exception thrown for that should have a message which states
this clearly. Previously a wrong message was given ("More than 200
merge bases ...")
Change-Id: Ia3c058d5575decdefd50390ed83b63668d31c1d1
Diffstat (limited to 'org.eclipse.jgit.http.server')
0 files changed, 0 insertions, 0 deletions