[merge]
	conflictStyle = diff3