| commit | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 00:40:50 +0000 (15 16:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 00:40:50 +0000 (15 16:40 -0800) | ||
| tree | 1dc29103a2e19a3ea95e5635af8468645913ccc9 | treesnapshot (tar.gz zip) |
| parent | 3176bd0b0da232207df99802bd714f51bc10f153 | commitdiff |
| parent | c8998b4823cbccd6bd49c2034e242ae7d5873eae | commitdiff |
Merge branch 'sc/difftool-p4merge'
* sc/difftool-p4merge:
mergetool--lib: add p4merge as a pre-configured mergetool option
* sc/difftool-p4merge:
mergetool--lib: add p4merge as a pre-configured mergetool option
| contrib/completion/git-completion.bash | diff1 | diff2 | blobhistory |