From: Scott Chacon <schacon@gmail.com>
Date: Wed, 28 Oct 2009 21:39:32 +0000 (-0700)
Subject: mergetool--lib: add p4merge as a pre-configured mergetool option
X-Git-Tag: v1.6.6-rc0~50^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c8998b4823cbccd6bd49c2034e242ae7d5873eae?hp=c8998b4823cbccd6bd49c2034e242ae7d5873eae

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>
---