Andrew's git / gitweb.git / diff
?
mergetool--lib: add p4merge as a pre-configured mergetool option
authorScott Chacon <schacon@gmail.com>
Wed, 28 Oct 2009 21:39:32 +0000 (14:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Oct 2009 23:48:20 +0000 (16:48 -0700)
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>
No differences found