diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-13 22:41:57 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-11-13 22:41:57 +0100 |
| commit | 4bdf0ec67978a0ac28fe40fd104736502f48fded (patch) | |
| tree | a9cff173a1c704102ac7ab80fd5adc315c8388a4 /org.eclipse.jgit/.settings | |
| parent | 1a091ff5f93a6d9843abb7f57a0cb7ebee7df511 (diff) | |
| download | jgit-4bdf0ec67978a0ac28fe40fd104736502f48fded.tar.gz jgit-4bdf0ec67978a0ac28fe40fd104736502f48fded.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 20d08c3a00..595bb4cd4f 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> |