diff options
Diffstat (limited to 'examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java')
| -rw-r--r-- | examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java index 2e8d003ed..b34651638 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java @@ -61,12 +61,12 @@ public class FileSystemMergeContext extends SubscriberMergeContext { throws CoreException { markAsMerged(diff, false, monitor); } - + @Override public ISchedulingRule getMergeRule(IDiff node) { return ResourceDiffTree.getResourceFor(node).getProject(); } - + @Override public IStatus merge(IDiff diff, boolean ignoreLocalChanges, IProgressMonitor monitor) throws CoreException { // Only attempt the merge for non-conflicts. The reason we do this @@ -83,5 +83,5 @@ public class FileSystemMergeContext extends SubscriberMergeContext { } return super.merge(diff, ignoreLocalChanges, monitor); } - + } |