global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-04 05:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
0bbf529bc54f742d2ed73bf77ca0603346f04701
git/git-mergetool--lib.sh
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

9.0 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink