diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-09-05 22:51:02 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-09-05 22:51:34 +0200 |
| commit | daddfe051b1e9fd74af58b72c9b7d3a25b1c6aa3 (patch) | |
| tree | 3b5a5d70ea875035df9d680e88e0f7c6b1e3c4d9 /org.eclipse.jgit.junit/BUILD | |
| parent | 38015e3d36369c7e43916117df7d0f2f8da8344b (diff) | |
| parent | d9b0601d3ace47e97acde83e28f11557e4929fb4 (diff) | |
| download | jgit-daddfe051b1e9fd74af58b72c9b7d3a25b1c6aa3.tar.gz jgit-daddfe051b1e9fd74af58b72c9b7d3a25b1c6aa3.zip | |
Merge branch 'master' into stable-5.9
* master:
SshdSession: close channel gracefully
jgit: Add DfsBundleWriter
Prepare 5.10.0-SNAPSHOT builds
ResolveMerger: do not content-merge gitlinks on del/mod conflicts
ResolveMerger: Adding test cases for GITLINK deletion
ResolveMerger: choose OURS on gitlink when ignoreConflicts
ResolveMerger: improving content merge readability
ResolveMerger: extracting createGitLinksMergeResult method
ResolveMerger: Adding test cases for GITLINK merge
Back out the version change to 5.10.0-SNAPSHOT which was done on master
already.
Change-Id: I1a6b1f0b8f5773be47823d74f593d13b16a601d5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.junit/BUILD')
0 files changed, 0 insertions, 0 deletions