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

diff --cc org.eclipse.jgit/.settings/.api_filters
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f2c73f5c487200998bd7be47de28af20d89bbcf6
new file mode 100644 (file)
--- /dev/null
--- /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>

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
Simple merge