]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
projects / thirdparty / Python / cpython.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2636d77) | patch
Stop ignoring Mercurial merge conflits files (#12255).
authorÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 10:07:31 +0000 (12:07 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 10:07:31 +0000 (12:07 +0200)
commit3037bb7340f3ea74d3f90d555a44050bcbe39257
treef4f7f7dac8b9160872c1a8741ba10fd6f123dca5tree | snapshot
parent2636d77c47a1ba92c3ca39dc125067e4ff538635commit | diff
Stop ignoring Mercurial merge conflits files (#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.
.hgignore diff | blob | blame | history
Mirror of https://github.com/python/cpython.git