Improve unresolved merge conflicts warning (
issue2681)
Suggested by Antoine Pitrou <pitrou@free.fr>
test-rename-merge1: make it easier to review, windows friendly
- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows
merge: drop resolve state for mergers with identical contents (
issue2680)