Auto merge of #7570 - twe4ked:already-existing-git-ignore-comment, r=alexcrichton
Only include "already existing ..." comment in gitignore on conflict
I found the comment a bit confusing when I've used `cargo init` when I haven't had any conflicts. I thought it was meaning that my existing entries would be all commented out so I thought there was a bug of some kind.
This PR changes the comment to only be included when there are conflicting entries in the existing file.
projects / cargo.git / commit