diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-05 01:21:05 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-05 01:27:26 +0100 |
| commit | 9b2457fd0daafb244f7aec9c4464ab7071e805fb (patch) | |
| tree | 61191adb947cf3404a767b217c51f0f3921b92d1 /org.eclipse.jgit.junit/src/org/eclipse | |
| parent | 8f4be20442499282b2c7ed061d039d4b5c01c1e6 (diff) | |
| parent | 9ed2e5c473e8334a20846e7fa0f5eb0aa369f0bb (diff) | |
| download | jgit-9b2457fd0daafb244f7aec9c4464ab7071e805fb.tar.gz jgit-9b2457fd0daafb244f7aec9c4464ab7071e805fb.zip | |
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
Diffstat (limited to 'org.eclipse.jgit.junit/src/org/eclipse')
0 files changed, 0 insertions, 0 deletions