From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 08:11:46 +0000 (-0800)
Subject: Merge branch 'ls/p4-lfs'
X-Git-Tag: v2.12.0-rc0~96
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7143258d79031648507a8066603ef04ec4413a21

Merge branch 'ls/p4-lfs'

Update GitLFS integration with "git p4".

* ls/p4-lfs:
git-p4: add diff/merge properties to .gitattributes for GitLFS files
---

7143258d79031648507a8066603ef04ec4413a21