]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e435f7d) | patch
IndexDiff: conflicting files aren't properly shown 95/3295/3
authorBernard Leach <leachbj@bouncycastle.org>
Fri, 29 Apr 2011 09:42:10 +0000 (19:42 +1000)
committerChris Aniszczyk <caniszczyk@gmail.com>
Thu, 5 May 2011 18:48:57 +0000 (13:48 -0500)
commit298486a7c320629de12f9506e0133686a7382b01
tree4a3f545edd4fb769f89d33b4d071233a4da17d41tree | snapshot
parente435f7de7748081945b02a0896dc54f4d6cc053ccommit | diff
IndexDiff: conflicting files aren't properly shown

Before this change any files in the conflicting set would
also be listed in the the other IndexDiff Sets which is
confusing.  With this change a conflicting file will not
be included in any of the other sets.

Change-Id: Ife9f2652685220bcfddc1f9820423acdcd5acfdc
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