Skip to content

Commit

Permalink
Bump JGit to 3a7a9cb0e (stable-6.10 tip)
Browse files Browse the repository at this point in the history
This adds support for the 'union' merge conflict strategy via
gitattribute configuration. Many Gerrit APIs do not load gitattribute
data, so a follow-up change is necessary to enable it.

$ git log --oneline --no-merges 1cd87ab79...3a7a9cb0e
3a7a9cb0e ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider
4f48a5b1e Add Union merge strategy support
eeccc5a92 Update Apache sshd to 2.14.0
ed0835856 LfsConnectionFactoryTest: remove unnecessary cast
72652ff65 JSchSshProtocol2Test: remove unnecessary cast
a2e477296 ApacheSshProtocol2Test: remove unnecessary cast
9e1cd8aec NoteMapMerger: remove unnecessary cast

Change-Id: I4da8675847260697989e0a692e4a60dac310bae6
Release-Notes: Bump JGit to 3a7a9cb0e for Union merge conflict strategy support
  • Loading branch information
Nasser Grainawi committed Nov 6, 2024
1 parent 71c50e4 commit 24ba9d9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/jgit
Submodule jgit updated from 1cd87a to 3a7a9c

0 comments on commit 24ba9d9

Please sign in to comment.