diff options
| author | Mathias Kinzler <mathias.kinzler@sap.com> | 2010-12-16 08:41:36 +0100 |
|---|---|---|
| committer | Mathias Kinzler <mathias.kinzler@sap.com> | 2010-12-16 08:41:36 +0100 |
| commit | 73f36aa8f73654e533512ce1fd73ec335ea153df (patch) | |
| tree | 1970e373a279867e3e345d75a17d8bf753032519 /org.eclipse.jgit | |
| parent | c19093bbad098fb268e0889cff1a782272eb9f5d (diff) | |
| download | jgit-73f36aa8f73654e533512ce1fd73ec335ea153df.tar.gz jgit-73f36aa8f73654e533512ce1fd73ec335ea153df.zip | |
DirCacheCheckout: fix getToBeDeleted()
This wrongly returns the same as getConflicts()
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Change-Id: Id37c625458fc5a9b3987f05b684620e24fdfe852
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 2 |
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 c9df809afe..c856d1a7f5 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; } /** |