diff options
| author | Andre Bossert <andre.bossert@siemens.com> | 2020-01-19 20:41:23 +0100 |
|---|---|---|
| committer | Simeon Andreev <simeon.danailov.andreev@gmail.com> | 2021-12-08 10:43:00 +0100 |
| commit | 14a59bdc7b37c85591eed07bc60c3f4fdcde2a8a (patch) | |
| tree | fea19991aa9b034079a8e0acf437aadb750fb076 /org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | |
| parent | caea5a26f08c6cf969607a178bc54896120d0940 (diff) | |
| download | jgit-14a59bdc7b37c85591eed07bc60c3f4fdcde2a8a.tar.gz jgit-14a59bdc7b37c85591eed07bc60c3f4fdcde2a8a.zip | |
Add config reader for user-defined difftools
see: http://git-scm.com/docs/git-difftool
* add config reader for user-defined difftools
* diff.tool
* diff.guitool
* difftool.prompt
* difftool.trustExitCode
* difftool.<tool>.path
* difftool.<tool>.cmd
* add pre-defined difftools
* implemented "git difftool --tool-help" to verify config reader and
pre-defined difftools
Bug: 356832
Change-Id: Idde8fddbef61f3378ee565c6321570b3962d0e1d
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 3e0a4eaf20..3d6e909adf 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Import-Package: org.eclipse.jgit.api;version="[6.1.0,6.2.0)", org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", org.eclipse.jgit.diff;version="[6.1.0,6.2.0)", org.eclipse.jgit.dircache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="6.1.0", org.eclipse.jgit.internal.storage.file;version="6.1.0", org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", |