* Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926

* Skip detecting content renames for binary files

* Finish upgrading eclipse-jarsigner-plugin to 1.3.1
* Upgrade maven-javadoc-plugin to 3.3.0
* Update maven-project-info-reports-plugin to 3.1.2
* Update spotbugs-maven-plugin to 4.2.3

* RepoCommand: Retry commit on LockFailure

* JGit v5.12.0.202105261145-m3

* Merge branch 'master' into stable-5.12

* RepoCommand: Do not set 'branch' if the revision is a tag

* Add git config for conflict style merge/diff3

* ApplyCommand: fix "no newline at end" detection
* ApplyCommand: handle completely empty context lines in text patches
* ApplyCommand: use byte arrays for text patches, not strings
* ApplyCommand: support binary patches
* ApplyCommand: add a stream to apply a delta patch
* ApplyCommand: add streams to read/write binary patch hunks
* ApplyCommand: add a base-85 codec
* ApplyCommand: convert to git internal format before applying patch

* pgm: rewrite parents when --parents flag is passed

* SSH config: fix whitespace handling
* SSH config: fix negated patterns

* Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMS

* Merge branch 'stable-5.11'

* Prepare 5.11.2-SNAPSHOT builds

* Update bazlets and bazel version

* JGit v5.11.1.202105131744-r

* Merge branch 'master' into next

* Merge branch 'stable-5.12'

* Merge branch 'stable-5.11' into stable-5.12

* Merge branch 'stable-5.10' into stable-5.11

* Merge branch 'stable-5.9' into stable-5.10

* Merge branch 'stable-5.8' into stable-5.9

* Merge branch 'stable-5.7' into stable-5.8

* Merge branch 'stable-5.6' into stable-5.7

* Remove texts which were added by mistake in 00386272
* Fix formatting which was broken in 00386272

* Merge branch 'stable-5.12'

* Merge branch 'stable-5.11' into stable-5.12

* Merge branch 'stable-5.10' into stable-5.11

* Merge branch 'stable-5.9' into stable-5.10

* Merge branch 'stable-5.8' into stable-5.9

* Merge branch 'stable-5.7' into stable-5.8

* Merge branch 'stable-5.6' into stable-5.7

* LockFile: create OutputStream only when needed

* Add a cgit interoperability test for LockFile
* Add TemporaryBuffer.toString(int limit)

* LockFile: create OutputStream only when needed

* Merge branch 'stable-5.12'

* Prepare 5.12.0-SNAPSHOT builds

* JGit v5.12.0.202105051250-m2

* [releng] Update eclipse-jarsigner-plugin to 1.3.1

* Update jetty to 9.4.40.v20210413

* Implement ours/theirs content conflict resolution

* ssh: ensure list is modifiable before using Iterator.remove().

* Update orbit to S20210406213021 and add 4.20-staging target

* Fix typo in test method name

* Upgrade ecj to 3.25.0

* Allow file mode conflicts in virtual base commit on recursive merge.

* sshd: don't lock the known_hosts files on reading
* Allow info messages in UsernamePasswordCredentialsProvider
* ssh config: do environment variable replacement
* sshd: implement server-sig-algs SSH extension (client side)

* Bazel: Remove unused dependencies flagged by unused_deps
* Bazel: Format build file with buildifier

* Upgrade wagon-ssh to 3.4.3
* Update spring-boot-maven-plugin to 2.4.4
* Update spotbugs-maven-plugin to 4.2.2
* Update japicmp-maven-plugin to 0.15.3

* Merge branch 'stable-5.11'