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
Junio C Hamano committed
Dec 27, 2016 at 00:11 UTC
7143258d79031648507a8066603ef04ec4413a21
No changes.