Andre Bossert 8573435635 Add command line support for "git mergetool" ... see: https://git-scm.com/docs/git-mergetool see: https://git-scm.com/docs/git-config * add command line support for "git mergetool" * add option handling for "--tool-help", "--tool=<mytool>", "--[no-]prompt", "--[no-]gui" * handle prompt * add MergeTools * add pre-defined mergetools * print merge actions --> no execute, will be done later Bug: 356832 Change-Id: I6e505ffc3d03f75ecf4bba452a25d25dfcf5793f Signed-off-by: Andre Bossert <andre.bossert@siemens.com>		2022-05-25 13:52:04 +02:00
..
org.eclipse.jgit.pgm.TextBuiltin	Add command line support for "git mergetool"	2022-05-25 13:52:04 +02:00