From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 5 Nov 2024 00:21:05 +0000 (+0100)
Subject: Merge branch 'stable-7.0' into stable-7.1
X-Git-Tag: v7.1.0.202411121450-m3~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F1203541%2F1;p=jgit.git

Merge branch 'stable-7.0' into stable-7.1

* stable-7.0:
  ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider
  Add Union merge strategy support

Change-Id: I15674134f4c73ac2de514d4fac4a36fca7ed7b07
---

9b2457fd0daafb244f7aec9c4464ab7071e805fb
diff --cc org.eclipse.jgit/.settings/.api_filters
index 0000000000,0000000000..f2c73f5c48
new file mode 100644
--- /dev/null
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,0 -1,0 +1,39 @@@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<component id="org.eclipse.jgit" version="2">
++    <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="ATTR_BUILTIN_UNION_MERGE_DRIVER"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/merge/ContentMergeStrategy.java" type="org.eclipse.jgit.merge.ContentMergeStrategy">
++        <filter id="1176502275">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="UNION"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
++        <filter id="336658481">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="attributesNodeProvider"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="attributesNodeProvider"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.10.1"/>
++                <message_argument value="setAttributesNodeProvider(AttributesNodeProvider)"/>
++            </message_arguments>
++        </filter>
++    </resource>
++</component>