2013-08-04 23:49:47 +03:00
|
|
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
|
|
<component id="org.eclipse.jgit" version="2">
|
|
|
|
<resource path="META-INF/MANIFEST.MF">
|
2014-06-18 12:33:34 +03:00
|
|
|
<filter comment="minor addition" id="924844039">
|
|
|
|
<message_arguments>
|
|
|
|
<message_argument value="3.4.0"/>
|
|
|
|
<message_argument value="3.4.0"/>
|
|
|
|
</message_arguments>
|
|
|
|
</filter>
|
2013-08-04 23:49:47 +03:00
|
|
|
</resource>
|
2013-05-01 20:20:31 +03:00
|
|
|
<resource path="src/org/eclipse/jgit/lib/ObjectInserter.java" type="org.eclipse.jgit.lib.ObjectInserter">
|
|
|
|
<filter id="336695337">
|
|
|
|
<message_arguments>
|
|
|
|
<message_argument value="org.eclipse.jgit.lib.ObjectInserter"/>
|
|
|
|
<message_argument value="newReader()"/>
|
|
|
|
</message_arguments>
|
|
|
|
</filter>
|
|
|
|
</resource>
|
2014-07-30 18:01:56 +03:00
|
|
|
<resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
|
|
|
|
<filter comment="Doesn't break consumers. Breaking providers is allowed also in minor versions." id="338792546">
|
|
|
|
<message_arguments>
|
|
|
|
<message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
|
|
|
|
<message_argument value="mergeTreeWalk(TreeWalk)"/>
|
|
|
|
</message_arguments>
|
|
|
|
</filter>
|
|
|
|
<filter comment="Doesn't break consumers. Breaking providers is allowed also in minor versions." id="338792546">
|
|
|
|
<message_arguments>
|
|
|
|
<message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
|
|
|
|
<message_argument value="mergeTrees(AbstractTreeIterator, RevTree, RevTree)"/>
|
|
|
|
</message_arguments>
|
|
|
|
</filter>
|
|
|
|
<filter comment="Doesn't break consumers. Breaking providers is allowed also in minor versions." id="338792546">
|
|
|
|
<message_arguments>
|
|
|
|
<message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
|
|
|
|
<message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator)"/>
|
|
|
|
</message_arguments>
|
|
|
|
</filter>
|
|
|
|
</resource>
|
2013-08-04 23:49:47 +03:00
|
|
|
</component>
|