Andrew's git / gitweb.git / diff
?
Merge branch 'ls/p4-lfs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 08:11:46 +0000 (00:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 08:11:46 +0000 (00:11 -0800)
Update GitLFS integration with "git p4".

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

1  2 
git-p4.py patch | diff1 | diff2 | blob | history
t/t9824-git-p4-git-lfs.sh patch | diff1 | diff2 | blob | history
diff --cc git-p4.py
Simple merge
diff --cc t/t9824-git-p4-git-lfs.sh
Simple merge