diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2025-05-07 08:57:38 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2025-05-07 08:57:38 +0200 |
| commit | d0d0bdf97a1542cf7e677d9e56747e6b5c9daa74 (patch) | |
| tree | d2ddea070fee4a1df66438ec31ad0e1651abceaa /org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java | |
| parent | cd7c9c1f0421c9370b26957ed7a00094787cd5f9 (diff) | |
| parent | 8a07b54e8878f04d6d11bf48b12f8c7acc73154c (diff) | |
| download | jgit-d0d0bdf97a1542cf7e677d9e56747e6b5c9daa74.tar.gz jgit-d0d0bdf97a1542cf7e677d9e56747e6b5c9daa74.zip | |
Merge branch 'master' into stable-7.3
* master:
DfsInserter: Remove checkExisting setter and parameter
PlotRefComparator: fix #timeof
PlotWalk: Replace call to deprecated method in PersonIdent
midx: Fix license header from Google Inc. to LLC
Remove option to enable bzlmod
Update bazel to 8.2.1
Update bazel to 7.6.1
MODULE.bazel: Move dependencies from WORKSPACE to bazel modules
Update commons-io:commons-io to 2.19.0
Update com.google.code.gson:gson to 2.13.0
PackExt: Add value for the multipack index
MultiPackIndex: Add and implement #resolve() method
MultiPackIndexWriter: Handle empty packs
MultiPackIndexWriter: return bytes written
MultiPackIndexV1: Calculate memsize with long
MultiPackIndexV1: Reorder methods and add NON-NLS annotations
MultiPackIndex: add #getMemorySize() method
midx: reader for the multipack index
DfsPackFile.PackIndexes: pass primary index to reverse index
Change-Id: I8785cb395fcdccc741ed1f258d641fbfa2bb7ab1
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java')
0 files changed, 0 insertions, 0 deletions