diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-16 03:40:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 03:40:50 +0300 |
| commit | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (patch) | |
| tree | 1dc29103a2e19a3ea95e5635af8468645913ccc9 /git-pull.sh | |
| parent | 3176bd0b0da232207df99802bd714f51bc10f153 (diff) | |
| parent | c8998b4823cbccd6bd49c2034e242ae7d5873eae (diff) | |
Merge branch 'sc/difftool-p4merge'
* sc/difftool-p4merge:
mergetool--lib: add p4merge as a pre-configured mergetool option
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions