zeripath baefea311f Fix #732: Add LFS objects to base repository on merging (#7082) ... On merge we walk the merge history and ensure that all lfs objects pointed to in the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)		2019-06-22 18:35:34 +01:00
..
lfs.go
merge.go