| commit | c8998b4823cbccd6bd49c2034e242ae7d5873eae | |
| author | Scott Chacon <schacon@gmail.com> | |
| Wed, 28 Oct 2009 21:39:32 +0000 (28 14:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Oct 2009 23:48:20 +0000 (28 16:48 -0700) | ||
| tree | a2e91d8202b7162c500ee1a3f9145040163a8506 | treesnapshot (tar.gz zip) |
| parent | cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea | commitdiff |
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>
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>