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

diff --git a/git-p4.py b/git-p4.py
index e752153f6f16247c23ff390e20ae18cf51158a30..fd3763b65405498cdc378c8922cb8ba45b02c5b8 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1098,10 +1098,10 @@ def generateGitAttributes(self):
                 '# Git LFS (see https://git-lfs.github.com/)\n',
                 '#\n',
             ] +
-            ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n'
+            ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
                 for f in sorted(gitConfigList('git-p4.largeFileExtensions'))
             ] +
-            ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n'
+            ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
                 for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f)
             ]
         )