* Add git config for conflict style merge/diff3

* Merge branch 'stable-5.11'

* Update Orbit to R20210223232630

* Merge branch 'stable-5.2' into stable-5.3

* reftable: pass OutputStream at construction time

* Increase bazel timeout for long running tests
* Bazel: Fix lint warning flagged by buildifier
* Update bazlets to latest version
* Bazel: Add missing dependencies for ArchiveCommandTest
* Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file

* UploadPackTest: refactor capability config test

* Bazel: Fix lint warning flagged by buildifier
* Update bazlets to latest version

* FS_POSIX: Fix reference comparison of Boolean.FALSE

* RevWalkUtils: add progress callback to findBranchesReachableFrom

* Merge branch 'stable-5.3'

* Merge branch 'stable-5.2' into stable-5.3

* SHA1: Use externalized message in log

* CommitBuilder: Deprecate setEncoding(String)
* CommitBuilder: Add missing periods on methods' Javadoc

* pgm: Handle IOException in Version command
* pgm: Fix missing braces in UploadPack.run()
* pgm: Handle IOException in UploadPack command
* pgm: Handle exceptions in Tag command
* pgm: Fix missing braces in Status.run()
* pgm: Handle exceptions in Status command
* pgm: Fix missing braces in ShowRef.run()
* pgm: Handle IOException in ShowRef command
* pgm: Fix missing braces in Show.run()
* pgm: Handle exceptions in Show command
* pgm: Fix missing braces in Rm command
* pgm: Handle GitAPIException in Rm command
* pgm: Handle exceptions in RevParse command
* pgm: Externalize error message

* ObjectDownloadListener#onWritePossible: Add comment on return statement

* HttpClientConnectionTest: Throw UnsupportedOperationException for unused methods
* HttpClientConnectionTest: Reformat with the Eclipse style
* HttpClientConnectionTest: Add missing license header

* JGit v4.11.1.201807311124-r

* Merge branch 'stable-4.9' into stable-4.10

* DirCache: Use constant from StandardCharsets

* GC: Open auto-closeable resources in try-with-resource

* DfsFsck: reduce memory usage during verifyIndex
* DfsFsck: refactor pack verify into its own method
* DfsFsck: run connectivity check pass exactly once

* Remove UTF-8 checking duplication in Config lib subclasses

* FileTreeIteratorTest: Open Git and RevWalk in try-with-resource
* RebaseCommandTest: Open RevWalk in try-with-resource
* PullCommandTest: Open RevWalk in try-with-resource
* BlameGeneratorTest: Create Git instances in try-with-resource
* Remove unnecessary suppression of deprecation warnings in tests
* DiffEntryTest: Open Git and TreeWalk in try-with-resource
* DiffCommandTest: Open Git and RevWalk in try-with-resource
* CommitCommandTest: Open Git and TreeWalk in try-with-resource

* Use try-with-resources to fix warnings in AddCommand

* Silence non-externalized string warning in PackParser
* Replace call to deprecated release() by close() in PackParser

* PlotLane: Use identity hashCode and equals

* Interactive rebase: Fix order of commit messages on squash

* Use absolute paths for file:// URIs in tests
* Use getPath() in FileResolverTest
* Extract protocol constants to a common class
* Move repeat() to utility class for tests
* Remove hardcoded target/trash from test cases
* Remove dependency on StatusCommandTest
* Remove dependency on DiffFormatterReflowTest
* Remove unnecessary import of BaseConnection in MessageWriter

* Attempt to stabilize GCTest
* Attempt to stabilize FileTreeIterator test on Windows

* Fix two typos in CLIText.properties

* Reassign symbolic ref list after calling put.