We have lots of large text files stored in LFS and want to merge them in a more natural way.

Currently, we have a custom merge driver to do this, and the workflow is very straightforward:

• git lfs smudge ${files}
• git merge-file ${files}
• git lfs clean ${merged_file}

For all the LFS manged text files, we use diff=lfs-text merge=lfs-text in .gitattributes. We haven't
found any significant issue with this approach so far. IMHO, this should be part of the lfs release,
and make those configs part of the git lfs install.