diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-05 01:29:08 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-05 01:29:08 +0100 |
commit | 78b3dd01eaf1e0cde8489a5e907beab7f7aee625 (patch) | |
tree | 264df8582cbb39fd572f9c1b2eeea5c94024d390 /org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/license.html | |
parent | 5029af8b2d4c5bbed3393f63807e3755e7e3195f (diff) | |
parent | 1342502ad0954526589437fd309ef70a36ee3099 (diff) | |
download | jgit-78b3dd01eaf1e0cde8489a5e907beab7f7aee625.tar.gz jgit-78b3dd01eaf1e0cde8489a5e907beab7f7aee625.zip |
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
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/license.html')
0 files changed, 0 insertions, 0 deletions