News for hackers. Stuff that matters.
Re:Version Control Before Git with CVS by jpeloquin on Sunday July 08, 2018 @05:54PM (#17486425)
Git can be told to use custom diff and merge drivers for particular file extensions via .gitattributes: https://git-scm.com/docs/gitattributes

For example, I have used .gitattributes to make git use MS Word to merge docx files, and LabView to merge .vi files. TortoiseGit (for Windows) includes diff/merge driver scripts for use with MS Word files.

There are no comments on this comment yet.