Andrey Loskutov 2ef2a3562e Merge branch 'master' into stable-6.2 ... * master: Adapt diff- and merge tool code for PGM and EGit usage Teach JGit to handle external diff/merge tools defined in .gitattributes Change-Id: I3aefc14160caaac859bd3548460dd755ebe42fc5		2022-06-03 15:51:54 +02:00
..
.settings	[checkout] Use .gitattributes from the commit to be checked out	2022-03-07 18:45:25 +01:00
META-INF	Merge branch 'master' into stable-6.2	2022-06-03 15:51:54 +02:00
findBugs	[spotbugs] Silence NP_BOOLEAN_RETURN_NULL in IgnoreNode#checkIgnored	2020-12-22 10:52:59 +01:00
resources/org/eclipse/jgit	Teach JGit to handle external diff/merge tools defined in .gitattributes	2022-06-02 10:36:39 +02:00
src/org/eclipse/jgit	Teach JGit to handle external diff/merge tools defined in .gitattributes	2022-06-02 10:36:39 +02:00
.classpath	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
.fbprefs	…
.gitignore	…
.project	…
BUILD	Fix stamping to produce stable file timestamps	2020-12-14 15:45:29 +01:00
about.html	SHA-1: collision detection support	2017-02-28 16:38:43 -08:00
build.properties	…
plugin.properties	Fix bundle localization of Apache SSH bundle	2019-06-21 17:54:06 +02:00
pom.xml	JGit v6.2.0.202206011217-rc1	2022-06-01 18:17:31 +02:00