]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 94ba957) | patch
Enhance MergeResult to report conflicts, etc 25/1225/5
authorChristian Halstrick <christian.halstrick@sap.com>
Thu, 19 Aug 2010 13:52:12 +0000 (15:52 +0200)
committerChris Aniszczyk <caniszczyk@gmail.com>
Thu, 19 Aug 2010 17:16:39 +0000 (12:16 -0500)
commit75c9b2438594dc6ac125ff1bdf97022c7f429b78
tree7f209395073f7a5ef9e3e61b2e9be31a444ad525tree | snapshot
parent94ba9574cd5589bbf7a3671533390b43936fe65bcommit | diff
Enhance MergeResult to report conflicts, etc

The MergeResult class is enhanced to report more data about a
three-way merge. Information about conflicts and the base, ours,
theirs commits can be retrived.

Change-Id: Iaaf41a1f4002b8fe3ddfa62dc73c787f363460c2
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit