From 73f36aa8f73654e533512ce1fd73ec335ea153df Mon Sep 17 00:00:00 2001 From: Mathias Kinzler Date: Thu, 16 Dec 2010 08:41:36 +0100 Subject: [PATCH] DirCacheCheckout: fix getToBeDeleted() This wrongly returns the same as getConflicts() Signed-off-by: Mathias Kinzler Change-Id: Id37c625458fc5a9b3987f05b684620e24fdfe852 --- .../src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c9df809af..c856d1a7f 100644 --- 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 List getConflicts() { * {@link DirCacheCheckout}. */ public List getToBeDeleted() { - return conflicts; + return toBeDeleted; } /**