diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:40:50 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:40:50 +0100 |
| commit | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (patch) | |
| tree | 1dc29103a2e19a3ea95e5635af8468645913ccc9 /git-pull.sh | |
| parent | Merge branch 'jk/maint-add-p-empty' (diff) | |
| parent | mergetool--lib: add p4merge as a pre-configured mergetool option (diff) | |
| download | git-9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e.tar.xz git-9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e.zip | |
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