]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-6.10' into stable-7.0 40/1203540/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2024 00:13:36 +0000 (01:13 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2024 00:16:52 +0000 (01:16 +0100)
commit9ed2e5c473e8334a20846e7fa0f5eb0aa369f0bb
tree2c1ab5b63537fba95d131cbd19e0d8eac9ac8060
parentf306a8a99c2c9aadbbd5b3153caae3d4ef4ba252
parent3a7a9cb0e89de263d0a5133949c9c9bed5141916
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
org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java