]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b69284f) | patch
Added support to IndexDiff to return information on conflicts 05/3105/4
authorBernard Leach <leachbj@bouncycastle.org>
Tue, 19 Apr 2011 21:51:40 +0000 (07:51 +1000)
committerChris Aniszczyk <caniszczyk@gmail.com>
Tue, 19 Apr 2011 22:11:01 +0000 (17:11 -0500)
commit1a867d10b974cab4d43d77f5b392f4f07807ebd8
tree9a9b47b5568b5d4ec01dfd54c4952d2f0dae279ctree | snapshot
parentb69284f72d717f50981c822edbff1dc3313cdd58commit | diff
Added support to IndexDiff to return information on conflicts

Change-Id: I43c13eb72a44f80135c93525fce0c0280b0e64a2
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit