From 7adacbd19a717cf831876c9d2cfbc9a75fa18672 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 6 Apr 2017 18:17:22 +0200
Subject: [PATCH] Silence API error for new method added to abstract
 MergeStrategy

OSGi semantic versioning rules allow to break implementors of an API in
a minor version.

Change-Id: I4ada3e6455e8e8e1bb8fb71affa0a1b36bd46fc4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 org.eclipse.jgit/.settings/.api_filters | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 644123236..03c6ce501 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -43,6 +43,14 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/jgit/merge/MergeStrategy.java" type="org.eclipse.jgit.merge.MergeStrategy">
+        <filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="336695337">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.merge.MergeStrategy"/>
+                <message_argument value="newMerger(ObjectInserter, Config)"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection">
         <filter comment="OSGi semantic versioning rules allow to break implementors in minor releases" id="403767336">
             <message_arguments>