diff options
| author | Scott Chacon <schacon@gmail.com> | 2009-10-28 21:39:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-28 23:48:20 (GMT) |
| commit | c8998b4823cbccd6bd49c2034e242ae7d5873eae (patch) | |
| tree | a2e91d8202b7162c500ee1a3f9145040163a8506 /git-sh-setup.sh | |
| parent | cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (diff) | |
| download | git-c8998b4823cbccd6bd49c2034e242ae7d5873eae.zip git-c8998b4823cbccd6bd49c2034e242ae7d5873eae.tar.gz git-c8998b4823cbccd6bd49c2034e242ae7d5873eae.tar.bz2 | |
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>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions