.gitattributes

$.html merge=ours 
$.oAttribute.html merge=ours
$.oBackdrop.html merge=ours
$.oBox.html merge=ours
$.oColor.html merge=ours
$.oColorValue.html merge=ours
$.oColumn.html merge=ours
$.oDialog.html merge=ours
$.oDialog.Progress.html merge=ours
$.oDrawing.html merge=ours
$.oDrawingColumn.html merge=ours
$.oDrawingNode.html merge=ours
$.oElement.html merge=ours
$.oFile.html merge=ours
$.oFolder.html merge=ours
$.oFrame.html merge=ours
$.oGroupNode.html merge=ours
$.oList.html merge=ours
$.oNetwork.html merge=ours
$.oNode.html merge=ours
$.oNodeLink.html merge=ours
$.oPalette.html merge=ours
$.oPathPoint.html merge=ours
$.oPegNode.html merge=ours
$.oPoint.html merge=ours
$.oScene.html merge=ours
$.oThread.html merge=ours
$.oTimeline.html merge=ours
$.oTimelineLayer.html merge=ours
$.oUtils.html merge=ours
$.index.html merge=ours
$.global.html merge=ours
$.oDatabase.html merge=ours
$.oProgressDialog.html merge=ours
$.oProcess.html merge=ours
NodeTypes.html merge=ours