Only include "already existing ..." comment in gitignore on conflict#7570

bors merged 3 commits intorust-lang:masterrust-lang/cargo:masterfrom

twe4ked:already-existing-git-ignore-commenttwe4ked/cargo:already-existing-git-ignore-commentCopy head branch name to clipboard