merge-branch/.gitignore