]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-7.1' 43/1203543/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2024 00:29:08 +0000 (01:29 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2024 00:29:08 +0000 (01:29 +0100)
commit78b3dd01eaf1e0cde8489a5e907beab7f7aee625
tree264df8582cbb39fd572f9c1b2eeea5c94024d390
parent5029af8b2d4c5bbed3393f63807e3755e7e3195f
parent1342502ad0954526589437fd309ef70a36ee3099
Merge branch 'stable-7.1'

* stable-7.1:
  Add missing @since 7.1 to UploadPack#implies
  ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider
  Add Union merge strategy support

Change-Id: Ib1c1725578e522c88f80f050d221a517bf012017
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java