diff options
| author |  Pete Wyckoff <pw@padd.com> | 2011-10-16 10:45:49 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-17 20:46:49 -0700 |
| commit | 97a21ca50ef893a171a50c863fe21a924935fd2a (patch) | |
| tree | bad0229a84bc3d24d3cefa18d26f841d22f17ccf /Documentation/git-merge-tree.txt | |
| parent | git-p4: recognize all p4 filetypes (diff) | |
| download | tgif-97a21ca50ef893a171a50c863fe21a924935fd2a.tar.xz | |
git-p4: stop ignoring apple filetype
Currently "apple" filetype is ignored explicitly, and the file is
not even included in the git repository. This seems wrong.
Remove this, letting it be treated like a "binary" filetype.
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions