/ .gitattributes
.gitattributes
1  *.lock merge=ours
2  *.rs	diff=rust