[HG] Fix .gitignore merge