diff options
Diffstat (limited to 'org.eclipse.jgit/src/org')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 1 |
1 files changed, 1 insertions, 0 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 f8be5006e3..44b4276905 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -627,6 +627,7 @@ public class DirCacheCheckout { keep(dce); // 5 6 else conflict(name, dce, h, m); // 5b 6b + break; case 0xFDD: // 10 11 // TODO: make use of tree extension as soon as available in jgit // we would like to do something like |