diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-11-06 21:21:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-06 21:21:57 -0800 |
| commit | de263479506066f240cf629aa3aac50c94668d89 (patch) | |
| tree | 2cb3992abf176354aed9cef273aa73932ea523e5 /mergetools/defaults | |
| parent | receive-pack: do not expect object 0{40} to exist (diff) | |
| parent | git-p4: ignore apple filetype (diff) | |
| download | tgif-de263479506066f240cf629aa3aac50c94668d89.tar.xz | |
Merge branch 'pw/p4-appledouble-fix'
* pw/p4-appledouble-fix:
git-p4: ignore apple filetype
Diffstat (limited to 'mergetools/defaults')
0 files changed, 0 insertions, 0 deletions