diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 10 |
1 files changed, 4 insertions, 6 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 68a53dfa87..465f01ada9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -352,12 +352,10 @@ public class DirCacheCheckout { } } } else { - // There is no file/folder for that path in the working tree. - // The only entry we have is the index entry. If that entry is a - // conflict simply remove it. Otherwise keep that entry in the - // index - if (i.getDirCacheEntry().getStage() == 0) - keep(i.getDirCacheEntry()); + // There is no file/folder for that path in the working tree, + // nor in the merge head. + // The only entry we have is the index entry. Like the case + // where there is a file with the same name, remove it, } } } |