# Keep local .gitignore changes when merging upstream.
.gitignore merge=ours
