Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Stop ignoring Mercurial merge conflits files (python#12255).
R. David Murray and I think that it’s more useful to have these files show up in the output of “hg status”, to let the user know that some merged file have to be checked before commit. If you want to ignore these files in your clones, it’s possible to do so from another ignore file; see the bug report for directions. I’m leaving the .gitignore file alone, as I don’t know how git users work with merges and conflicts.
- Loading branch information