diff options
| author | Andrey Loskutov <loskutov@gmx.de> | 2022-06-03 15:49:45 +0200 |
|---|---|---|
| committer | Andrey Loskutov <loskutov@gmx.de> | 2022-06-03 15:51:54 +0200 |
| commit | 2ef2a3562e9aa5c826ce063a2f1d3d8ffef1f0ce (patch) | |
| tree | b0f2988a40474499808220cd7d5fe677d87b6600 /org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | |
| parent | 7b1ade51d24f6efacfddd91fcfed7137c27642d3 (diff) | |
| parent | c32694e5ae98e5c1373afcb535a76d37e5d82a29 (diff) | |
| download | jgit-2ef2a3562e9aa5c826ce063a2f1d3d8ffef1f0ce.tar.gz jgit-2ef2a3562e9aa5c826ce063a2f1d3d8ffef1f0ce.zip | |
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
Diffstat (limited to 'org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF')
0 files changed, 0 insertions, 0 deletions