aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kinzler2010-12-16 02:41:36 (EST)
committerMathias Kinzler2010-12-16 02:41:36 (EST)
commit73f36aa8f73654e533512ce1fd73ec335ea153df (patch)
tree1970e373a279867e3e345d75a17d8bf753032519
parentc19093bbad098fb268e0889cff1a782272eb9f5d (diff)
downloadjgit-73f36aa8f73654e533512ce1fd73ec335ea153df.zip
jgit-73f36aa8f73654e533512ce1fd73ec335ea153df.tar.gz
jgit-73f36aa8f73654e533512ce1fd73ec335ea153df.tar.bz2
DirCacheCheckout: fix getToBeDeleted()refs/changes/37/2137/1
This wrongly returns the same as getConflicts() Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Change-Id: Id37c625458fc5a9b3987f05b684620e24fdfe852
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java2
1 files changed, 1 insertions, 1 deletions
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 c9df809..c856d1a 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 class DirCacheCheckout {
* {@link DirCacheCheckout}.
*/
public List<String> getToBeDeleted() {
- return conflicts;
+ return toBeDeleted;
}
/**