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
..
MANIFEST.MF	Merge branch 'master' into stable-6.2	2022-06-03 15:51:54 +02:00
SOURCE-MANIFEST.MF	JGit v6.2.0.202206011217-rc1	2022-06-01 18:17:31 +02:00