commit 4bdf0ec67978a0ac28fe40fd104736502f48fded
author Matthias Sohn <matthias.sohn@sap.com> Mon Nov 13 22:41:57 2017 +0100
committer Matthias Sohn <matthias.sohn@sap.com> Mon Nov 13 22:41:57 2017 +0100
tree a9cff173a1c704102ac7ab80fd5adc315c8388a4
parent 1a091ff5f93a6d9843abb7f57a0cb7ebee7df511

Silence invalid @since 3.5 API warning on ResolveMerge#processEntry

This method was removed in 4.9 and reintroduced in
I48ba4308dee73925fa32d6c2fd6b5fd89632c571 as deprecated in 4.9.1 in
order to help EMF Compare to avoid breakage.

Change-Id: Ia638517178313da42ae13ebcf88ad535d9a02723
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

org.eclipse.jgit/.settings/.api_filters

diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 20d08c3..595bb4c 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -38,6 +38,13 @@
         <filter id="1141899266">
             <message_arguments>
                 <message_argument value="3.5"/>
+                <message_argument value="4.10"/>
+                <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/>
+            </message_arguments>
+        </filter>
+        <filter id="1141899266">
+            <message_arguments>
+                <message_argument value="3.5"/>
                 <message_argument value="4.9"/>
                 <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/>
             </message_arguments>