]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0c4553d) | patch
Fixed message for exception thrown during recursive merge 61/30561/2
authorChristian Halstrick <christian.halstrick@sap.com>
Thu, 26 Jun 2014 11:42:21 +0000 (13:42 +0200)
committerChristian Halstrick <christian.halstrick@sap.com>
Mon, 28 Jul 2014 12:43:22 +0000 (14:43 +0200)
commit289b7c60a9e232f7b37829c5aad858c7c13286b7
tree7a51956bd78935a766f08e5b24cf18a77a0817a5tree | snapshot
parent0c4553d28a34dfb64f4af68032a9a33ca297975ecommit | diff
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
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit