DirCacheCheckout: fix getToBeDeleted()

This wrongly returns the same as getConflicts()
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Change-Id: Id37c625458fc5a9b3987f05b684620e24fdfe852

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
index c9df809afe399df98c3b503eeaac6b9c25e5cede..c856d1a7f5fbb2a327a62cf37d7cf2cca5cebd65 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@@ -130,7 +130,7 @@ public class DirCacheCheckout {
         *         {@link DirCacheCheckout}.
         */
        public List<String> getToBeDeleted() {
-               return conflicts;
+               return toBeDeleted;
        }
 
        /**