Merge branch 'stable-6.10' into stable-7.0

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

Change-Id: I0d768d793effd1deabb4807446a4f8c10a82ad74

diff --cc org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index 08c3b6c5c6e1b5830f9c2bec74e076f944181c2b,509a0d7283a7ddc393f62137384831b7793c8f6d..4a776a2cb8ac044de6d914c243f5ce669ebb9e45
--- 1/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@@ -3,25 -3,26 +3,26 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.lfs.test
  Bundle-SymbolicName: org.eclipse.jgit.lfs.test
 -Bundle-Version: 6.10.1.qualifier
 +Bundle-Version: 7.0.1.qualifier
  Bundle-Vendor: %Bundle-Vendor
  Bundle-Localization: plugin
 -Bundle-RequiredExecutionEnvironment: JavaSE-11
 -Import-Package: org.eclipse.jgit.api;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lfs.internal;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lfs.lib;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.util;version="[6.10.1,6.11.0)",
 +Bundle-RequiredExecutionEnvironment: JavaSE-17
 +Import-Package: org.eclipse.jgit.api;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)",
++ org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lfs.internal;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.1,7.1.0)",
   org.hamcrest.core;version="[1.1.0,3.0.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)",

diff --cc org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index 6a2ac379f661b243db29493f14027216766ece5e,6f2af63fc6f833cc949f2c94d696314675f4ba9f..3dc3f28506591e83a2ebe66ee5588100120bf7ae
--- 1/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@@ -22,16 -22,17 +22,17 @@@ Import-Package: org.apache.sshd.client.
   org.apache.sshd.core;version="[2.14.0,2.15.0)",
   org.apache.sshd.server;version="[2.14.0,2.15.0)",
   org.apache.sshd.server.forward;version="[2.14.0,2.15.0)",
 - org.eclipse.jgit.api;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport.sshd.agent;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.util;version="[6.10.1,6.11.0)",
 + org.eclipse.jgit.api;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)",
++ org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport.sshd.agent;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.1,7.1.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)"

diff --cc org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index 8192be0cc32c126e4a310b6eacf69ee00ba53098,5cece2dc59b16617e69ec353e161ed5db21fb66d..ae00275117027f95c57cdaf32af046d546c2212e
--- 1/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@@ -3,19 -3,20 +3,20 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test
  Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test
 -Bundle-Version: 6.10.1.qualifier
 +Bundle-Version: 7.0.1.qualifier
  Bundle-Vendor: %Bundle-Vendor
  Bundle-Localization: plugin
 -Bundle-RequiredExecutionEnvironment: JavaSE-11
 +Bundle-RequiredExecutionEnvironment: JavaSE-17
  Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
  Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
 - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.transport.ssh.jsch;version="[6.10.1,6.11.0)",
 - org.eclipse.jgit.util;version="[6.10.1,6.11.0)",
 + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)",
++ org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.transport.ssh.jsch;version="[7.0.1,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.1,7.1.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)"

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
index 3eb35be79a03aef742839fd6ae60103f516c2876,1a97d111e34e14a8b285932a89b7b61a7c0b65c3..a503db9e85fcf34186d9c43bd0efad6fa9750698
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
@@@ -526,27 -493,13 +526,34 @@@ public final class Constants 
         */
        public static final String ATTR_BUILTIN_BINARY_MERGER = "binary"; //$NON-NLS-1$
  
 +      /**
 +       * Prefix of a GPG signature.
 +       *
 +       * @since 7.0
 +       */
 +      public static final String GPG_SIGNATURE_PREFIX = "-----BEGIN PGP SIGNATURE-----"; //$NON-NLS-1$
 +
 +      /**
 +       * Prefix of a CMS signature (X.509, S/MIME).
 +       *
 +       * @since 7.0
 +       */
 +      public static final String CMS_SIGNATURE_PREFIX = "-----BEGIN SIGNED MESSAGE-----"; //$NON-NLS-1$
 +
 +      /**
 +       * Prefix of an SSH signature.
 +       *
 +       * @since 7.0
 +       */
 +      public static final String SSH_SIGNATURE_PREFIX = "-----BEGIN SSH SIGNATURE-----"; //$NON-NLS-1$
 +
+       /**
+        * Union built-in merge driver
+        *
+        * @since 6.10.1
+        */
+       public static final String ATTR_BUILTIN_UNION_MERGE_DRIVER = "union"; //$NON-NLS-1$
+ 
        /**
         * Create a new digest function for objects.
         *