diff options
Diffstat (limited to 'org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java')
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java index c34177c9a9..af7d7ef993 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2011, 2013 Dariusz Luksza <dariusz@luksza.org> and others. + * Copyright (C) 2011, 2015 Dariusz Luksza <dariusz@luksza.org> and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -152,8 +152,8 @@ class GitSyncCache { tw.addTree(dci); fti.setDirCacheIterator(tw, 3); } - List<ThreeWayDiffEntry> diffEntrys = ThreeWayDiffEntry.scan(tw); - + List<ThreeWayDiffEntry> diffEntrys = ThreeWayDiffEntry + .scan(tw, gsd); for (ThreeWayDiffEntry diffEntry : diffEntrys) repoCache.addMember(diffEntry); } catch (Exception e) { |