projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cd0f8e6) | patch
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)
commitc8998b4823cbccd6bd49c2034e242ae7d5873eae
treea2e91d8202b7162c500ee1a3f9145040163a8506tree | snapshot
parentcd0f8e6d63d3e2744d7d3b2329238be7d064a8eacommit | diff
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>
Documentation/git-difftool.txt diff | blob | history
Documentation/git-mergetool.txt diff | blob | history
Documentation/merge-config.txt diff | blob | history
contrib/completion/git-completion.bash diff | blob | history
git-mergetool--lib.sh diff | blob | history
Git—the stupid content tracker