]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-7.0' into stable-7.1 41/1203541/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2024 00:21:05 +0000 (01:21 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2024 00:27:26 +0000 (01:27 +0100)
commit9b2457fd0daafb244f7aec9c4464ab7071e805fb
tree61191adb947cf3404a767b217c51f0f3921b92d1
parent8f4be20442499282b2c7ed061d039d4b5c01c1e6
parent9ed2e5c473e8334a20846e7fa0f5eb0aa369f0bb
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
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java