diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-05 01:13:36 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-05 01:16:52 +0100 |
| commit | 9ed2e5c473e8334a20846e7fa0f5eb0aa369f0bb (patch) | |
| tree | 2c1ab5b63537fba95d131cbd19e0d8eac9ac8060 /org.eclipse.jgit.junit/src | |
| parent | f306a8a99c2c9aadbbd5b3153caae3d4ef4ba252 (diff) | |
| parent | 3a7a9cb0e89de263d0a5133949c9c9bed5141916 (diff) | |
| download | jgit-9ed2e5c473e8334a20846e7fa0f5eb0aa369f0bb.tar.gz jgit-9ed2e5c473e8334a20846e7fa0f5eb0aa369f0bb.zip | |
Merge branch 'stable-6.10' into stable-7.0
* stable-6.10:
ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider
Add Union merge strategy support
Change-Id: I0d768d793effd1deabb4807446a4f8c10a82ad74
Diffstat (limited to 'org.eclipse.jgit.junit/src')
0 files changed, 0 insertions, 0 deletions