Merge branch 'stable-5.6' into stable-5.7

author Matthias Sohn <matthias.sohn@sap.com>

Thu, 30 Dec 2021 22:53:54 +0000 (23:53 +0100)

committer Matthias Sohn <matthias.sohn@sap.com>

Thu, 30 Dec 2021 22:53:54 +0000 (23:53 +0100)
author Matthias Sohn <matthias.sohn@sap.com>
Thu, 30 Dec 2021 22:53:54 +0000 (23:53 +0100)
committer Matthias Sohn <matthias.sohn@sap.com>
Thu, 30 Dec 2021 22:53:54 +0000 (23:53 +0100)
diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java
Simple merge
diff --cc org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
Simple merge
author	Matthias Sohn <matthias.sohn@sap.com>
	Thu, 30 Dec 2021 22:53:54 +0000 (23:53 +0100)
committer	Matthias Sohn <matthias.sohn@sap.com>
	Thu, 30 Dec 2021 22:53:54 +0000 (23:53 +0100)
		1	2
org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java	patch \|	diff1 \|	diff2 \|	blob \| history