Scott Chacon c8998b4823 mergetool--lib: add p4merge as a pre-configured mergetool option ... Add p4merge to the set of built-in diff/merge tools, and update bash completion and documentation. Signed-off-by: Scott Chacon <schacon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2009-10-28 16:48:20 -07:00
..
git-completion.bash	mergetool--lib: add p4merge as a pre-configured mergetool option	2009-10-28 16:48:20 -07:00