diff options
| author |  Pete Wyckoff <pw@padd.com> | 2011-11-05 13:36:07 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-11-05 23:17:52 -0700 |
| commit | 9f7ef0eaf2e54609128add5e8f9b506bdbb81dff (patch) | |
| tree | f6dcf6261f2f6efea2d7ecaa0bb3ecf8e79560e2 /mergetools/defaults | |
| parent | git-p4: stop ignoring apple filetype (diff) | |
| download | tgif-9f7ef0eaf2e54609128add5e8f9b506bdbb81dff.tar.xz | |
git-p4: ignore apple filetype
Revert 97a21ca (git-p4: stop ignoring apple filetype, 2011-10-16)
and add a test case.
Reported-by: Michael Wookey <michaelwookey@gmail.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/defaults')
0 files changed, 0 insertions, 0 deletions