comparison CONTRIBUTORS @ 13541:919174c0aaff stable

Improve unresolved merge conflicts warning (issue2681) Suggested by Antoine Pitrou <pitrou@free.fr>
author Patrick Mezard <pmezard@gmail.com>
date Sun, 06 Mar 2011 15:21:50 +0100
parents c29efd272395
children
comparison
equal deleted inserted replaced
13534:4ec34de8bbb1 13541:919174c0aaff