Merge with upstream .gitignore.